Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: Source/platform/graphics/angle/ANGLEPlatformBridge.h

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed bad merge Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ANGLEWebKitBridge_h 26 #ifndef ANGLEPlatformBridge_h
27 #define ANGLEWebKitBridge_h 27 #define ANGLEPlatformBridge_h
28 28
29 #include "GLSLANG/ShaderLang.h"
30
31 #include "platform/PlatformExport.h"
29 #include "wtf/text/CString.h" 32 #include "wtf/text/CString.h"
30 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
31 34
32 #include "ShaderLang.h"
33
34 namespace WebCore { 35 namespace WebCore {
35 36
36 enum ANGLEShaderType { 37 enum PLATFORM_EXPORT ANGLEShaderType {
37 SHADER_TYPE_VERTEX = SH_VERTEX_SHADER, 38 SHADER_TYPE_VERTEX = SH_VERTEX_SHADER,
38 SHADER_TYPE_FRAGMENT = SH_FRAGMENT_SHADER, 39 SHADER_TYPE_FRAGMENT = SH_FRAGMENT_SHADER,
39 }; 40 };
40 41
41 enum ANGLEShaderSymbolType { 42 enum PLATFORM_EXPORT ANGLEShaderSymbolType {
42 SHADER_SYMBOL_TYPE_ATTRIBUTE, 43 SHADER_SYMBOL_TYPE_ATTRIBUTE,
43 SHADER_SYMBOL_TYPE_UNIFORM 44 SHADER_SYMBOL_TYPE_UNIFORM
44 }; 45 };
45 46
46 struct ANGLEShaderSymbol { 47 struct PLATFORM_EXPORT ANGLEShaderSymbol {
47 ANGLEShaderSymbolType symbolType; 48 ANGLEShaderSymbolType symbolType;
48 String name; 49 String name;
49 String mappedName; 50 String mappedName;
50 ShDataType dataType; 51 ShDataType dataType;
51 int size; 52 int size;
52 bool isArray; 53 bool isArray;
53 ShPrecisionType precision; 54 ShPrecisionType precision;
54 #if ANGLE_SH_VERSION >= 112 55 #if ANGLE_SH_VERSION >= 112
55 int staticUse; 56 int staticUse;
56 #endif 57 #endif
57 58
58 bool isSampler() const 59 bool isSampler() const
59 { 60 {
60 return symbolType == SHADER_SYMBOL_TYPE_UNIFORM 61 return symbolType == SHADER_SYMBOL_TYPE_UNIFORM
61 && (dataType == SH_SAMPLER_2D 62 && (dataType == SH_SAMPLER_2D
62 || dataType == SH_SAMPLER_CUBE 63 || dataType == SH_SAMPLER_CUBE
63 || dataType == SH_SAMPLER_2D_RECT_ARB 64 || dataType == SH_SAMPLER_2D_RECT_ARB
64 || dataType == SH_SAMPLER_EXTERNAL_OES); 65 || dataType == SH_SAMPLER_EXTERNAL_OES);
65 } 66 }
66 }; 67 };
67 68
68 class ANGLEWebKitBridge { 69 class PLATFORM_EXPORT ANGLEPlatformBridge {
69 public: 70 public:
70 71
71 ANGLEWebKitBridge(ShShaderOutput = SH_GLSL_OUTPUT, ShShaderSpec = SH_WEBGL_S PEC); 72 ANGLEPlatformBridge(ShShaderOutput = SH_GLSL_OUTPUT, ShShaderSpec = SH_WEBGL _SPEC);
72 ~ANGLEWebKitBridge(); 73 ~ANGLEPlatformBridge();
73 74
74 ShBuiltInResources getResources() { return m_resources; } 75 ShBuiltInResources getResources() { return m_resources; }
75 void setResources(ShBuiltInResources); 76 void setResources(ShBuiltInResources);
76 77
77 bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<ANGLEShaderSymbol>& symbols, int extraCompileOptions = 0); 78 bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<ANGLEShaderSymbol>& symbols, int extraCompileOptions = 0);
78 79
79 private: 80 private:
80 81
81 void cleanupCompilers(); 82 void cleanupCompilers();
82 83
83 bool builtCompilers; 84 bool builtCompilers;
84 85
85 ShHandle m_fragmentCompiler; 86 ShHandle m_fragmentCompiler;
86 ShHandle m_vertexCompiler; 87 ShHandle m_vertexCompiler;
87 88
88 ShShaderOutput m_shaderOutput; 89 ShShaderOutput m_shaderOutput;
89 ShShaderSpec m_shaderSpec; 90 ShShaderSpec m_shaderSpec;
90 91
91 ShBuiltInResources m_resources; 92 ShBuiltInResources m_resources;
92 }; 93 };
93 94
94 } // namespace WebCore 95 } // namespace WebCore
95 96
96 #endif 97 #endif
OLDNEW
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/graphics/angle/ANGLEPlatformBridge.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698