Skip to content

A
angle
Commit 13cfd276 by Jamie Madill
Options

Move shader variables header to include folder.

This allows the API to query for clear type introspection into the parsed GL types from the translator. The returned types are not expanded and have properly nested fields. This patch uses the types from ShaderVars.h to return GL type information. The app must include this header to get access to the types structs. BUG=angle:466 Change-Id: I28ad0d6f11a964804dd234ef0d00651f665d1ae3 Reviewed-on: https://chromium-review.googlesource.com/208751Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent 6a72979f
Showing with 45 additions and 43 deletions
src/common/shadervars.h → include/GLSLANG/ShaderVars.h
...@@ -3,17 +3,18 @@ ...@@ -3,17 +3,18 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// shadervars.h: // ShaderVars.h:
// Types to represent GL variables (varyings, uniforms, etc) // Types to represent GL variables (varyings, uniforms, etc)
// //
#ifndef COMMON_SHADERVARIABLE_H_ #ifndef _COMPILER_INTERFACE_VARIABLES_
#define COMMON_SHADERVARIABLE_H_ #define _COMPILER_INTERFACE_VARIABLES_
#include <string> #include <string>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include "GLSLANG/ShaderLang.h"
#include "ShaderLang.h"
namespace sh namespace sh
{ {
...@@ -124,4 +125,4 @@ struct InterfaceBlock ...@@ -124,4 +125,4 @@ struct InterfaceBlock
} }
#endif // COMMON_SHADERVARIABLE_H_ #endif // _COMPILER_INTERFACE_VARIABLES_
projects/src/libEGL.vcxproj
...@@ -131,11 +131,11 @@ ...@@ -131,11 +131,11 @@
<ClInclude Include="..\..\src\common\utilities.h"/> <ClInclude Include="..\..\src\common\utilities.h"/>
<ClInclude Include="..\..\src\common\tls.h"/> <ClInclude Include="..\..\src\common\tls.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/> <ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\common\shadervars.h"/>
<ClInclude Include="..\..\src\common\blocklayout.h"/> <ClInclude Include="..\..\src\common\blocklayout.h"/>
<ClInclude Include="..\..\include\angle_gl.h"/> <ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h"/>
<ClInclude Include="..\..\include\GLES2\gl2.h"/> <ClInclude Include="..\..\include\GLES2\gl2.h"/>
<ClInclude Include="..\..\include\GLES2\gl2platform.h"/> <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"/> <ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
...@@ -152,8 +152,8 @@ ...@@ -152,8 +152,8 @@
<ClCompile Include="..\..\src\libEGL\main.cpp"/> <ClCompile Include="..\..\src\libEGL\main.cpp"/>
<ClCompile Include="..\..\src\libEGL\Display.cpp"/> <ClCompile Include="..\..\src\libEGL\Display.cpp"/>
<ClCompile Include="..\..\src\libEGL\libEGL.cpp"/> <ClCompile Include="..\..\src\libEGL\libEGL.cpp"/>
<ClCompile Include="..\..\src\common\mathutil.cpp"/>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"/> <ClCompile Include="..\..\src\common\RefCountObject.cpp"/>
<ClCompile Include="..\..\src\common\mathutil.cpp"/>
<ClCompile Include="..\..\src\common\tls.cpp"/> <ClCompile Include="..\..\src\common\tls.cpp"/>
<ClCompile Include="..\..\src\common\debug.cpp"/> <ClCompile Include="..\..\src\common\debug.cpp"/>
<ClCompile Include="..\..\src\common\event_tracer.cpp"/> <ClCompile Include="..\..\src\common\event_tracer.cpp"/>
......
projects/src/libEGL.vcxproj.filters
...@@ -69,15 +69,15 @@ ...@@ -69,15 +69,15 @@
<None Include="..\..\src\libEGL\libEGL.def"> <None Include="..\..\src\libEGL\libEGL.def">
<Filter>src\libEGL</Filter> <Filter>src\libEGL</Filter>
</None> </None>
<ClCompile Include="..\..\src\common\mathutil.cpp"> <ClInclude Include="..\..\src\common\RefCountObject.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"> <ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\common\RefCountObject.h"> <ClCompile Include="..\..\src\common\mathutil.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClCompile>
<ClCompile Include="..\..\src\common\tls.cpp"> <ClCompile Include="..\..\src\common\tls.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
...@@ -117,9 +117,6 @@ ...@@ -117,9 +117,6 @@
<ClInclude Include="..\..\src\common\angleutils.h"> <ClInclude Include="..\..\src\common\angleutils.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\shadervars.h">
<Filter>src\common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\blocklayout.h"> <ClInclude Include="..\..\src\common\blocklayout.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
...@@ -135,6 +132,9 @@ ...@@ -135,6 +132,9 @@
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
<Filter>include\GLSLANG</Filter> <Filter>include\GLSLANG</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h">
<Filter>include\GLSLANG</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2.h"> <ClInclude Include="..\..\include\GLES2\gl2.h">
<Filter>include\GLES2</Filter> <Filter>include\GLES2</Filter>
</ClInclude> </ClInclude>
......
projects/src/libGLESv2.vcxproj
...@@ -274,7 +274,6 @@ ...@@ -274,7 +274,6 @@
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\blocklayout.h"/> <ClInclude Include="..\..\src\common\blocklayout.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\shadervars.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/> <ClInclude Include="..\..\src\common\utilities.h"/>
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
...@@ -286,6 +285,7 @@ ...@@ -286,6 +285,7 @@
<ClInclude Include="..\..\include\angle_gl.h"/> <ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h"/>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"/> <ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
<ClInclude Include="..\..\include\GLES2\gl2.h"/> <ClInclude Include="..\..\include\GLES2\gl2.h"/>
<ClInclude Include="..\..\include\GLES2\gl2platform.h"/> <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
...@@ -318,6 +318,7 @@ ...@@ -318,6 +318,7 @@
<ClCompile Include="..\..\src\libGLESv2\State.cpp"/> <ClCompile Include="..\..\src\libGLESv2\State.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/> <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\VertexAttribute.cpp"/> <ClCompile Include="..\..\src\libGLESv2\VertexAttribute.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Caps.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Context.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Context.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Buffer.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/> <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
...@@ -325,7 +326,6 @@ ...@@ -325,7 +326,6 @@
<ClCompile Include="..\..\src\libGLESv2\Uniform.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Uniform.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\main.cpp"/> <ClCompile Include="..\..\src\libGLESv2\main.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Caps.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/> <ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/>
......
projects/src/libGLESv2.vcxproj.filters
...@@ -186,6 +186,9 @@ ...@@ -186,6 +186,9 @@
<ClInclude Include="..\..\src\libGLESv2\Program.h"> <ClInclude Include="..\..\src\libGLESv2\Program.h">
<Filter>src\libGLESv2</Filter> <Filter>src\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\Caps.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"> <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
<Filter>src\libGLESv2</Filter> <Filter>src\libGLESv2</Filter>
</ClInclude> </ClInclude>
...@@ -243,9 +246,6 @@ ...@@ -243,9 +246,6 @@
<ClInclude Include="..\..\src\libGLESv2\formatutils.h"> <ClInclude Include="..\..\src\libGLESv2\formatutils.h">
<Filter>src\libGLESv2</Filter> <Filter>src\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\Caps.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\Buffer.h"> <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
<Filter>src\libGLESv2</Filter> <Filter>src\libGLESv2</Filter>
</ClInclude> </ClInclude>
...@@ -792,9 +792,6 @@ ...@@ -792,9 +792,6 @@
<ClInclude Include="..\..\src\common\debug.h"> <ClInclude Include="..\..\src\common\debug.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\shadervars.h">
<Filter>src\common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\utilities.h"> <ClInclude Include="..\..\src\common\utilities.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
...@@ -849,6 +846,9 @@ ...@@ -849,6 +846,9 @@
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
<Filter>include\GLSLANG</Filter> <Filter>include\GLSLANG</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h">
<Filter>include\GLSLANG</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"> <ClInclude Include="..\..\include\GLES2\gl2ext.h">
<Filter>include\GLES2</Filter> <Filter>include\GLES2</Filter>
</ClInclude> </ClInclude>
......
projects/src/translator_lib.vcxproj
...@@ -119,7 +119,6 @@ ...@@ -119,7 +119,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h"/> <ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h"/>
<ClInclude Include="..\..\src\common\shadervars.h"/>
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\tls.h"/> <ClInclude Include="..\..\src\common\tls.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
...@@ -195,6 +194,7 @@ ...@@ -195,6 +194,7 @@
<ClInclude Include="..\..\include\angle_gl.h"/> <ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h"/>
<ClInclude Include="..\..\include\GLES2\gl2platform.h"/> <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"/> <ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
<ClInclude Include="..\..\include\GLES2\gl2.h"/> <ClInclude Include="..\..\include\GLES2\gl2.h"/>
......
projects/src/translator_lib.vcxproj.filters
...@@ -54,9 +54,6 @@ ...@@ -54,9 +54,6 @@
<ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h"> <ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h">
<Filter>src\third_party\compiler</Filter> <Filter>src\third_party\compiler</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\shadervars.h">
<Filter>src\common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\RefCountObject.h"> <ClInclude Include="..\..\src\common\RefCountObject.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
...@@ -477,6 +474,9 @@ ...@@ -477,6 +474,9 @@
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
<Filter>include\GLSLANG</Filter> <Filter>include\GLSLANG</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ShaderVars.h">
<Filter>include\GLSLANG</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2platform.h"> <ClInclude Include="..\..\include\GLES2\gl2platform.h">
<Filter>include\GLES2</Filter> <Filter>include\GLES2</Filter>
</ClInclude> </ClInclude>
......
src/common/blocklayout.cpp
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
// Implementation for block layout classes and methods. // Implementation for block layout classes and methods.
// //
#include <GLSLANG/ShaderVars.h>
#include "common/blocklayout.h" #include "common/blocklayout.h"
#include "common/shadervars.h"
#include "common/mathutil.h" #include "common/mathutil.h"
#include "common/utilities.h" #include "common/utilities.h"
......
src/common/blocklayout.h
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
#ifndef COMMON_BLOCKLAYOUT_H_ #ifndef COMMON_BLOCKLAYOUT_H_
#define COMMON_BLOCKLAYOUT_H_ #define COMMON_BLOCKLAYOUT_H_
#include <cstddef>
#include <vector> #include <vector>
#include "angle_gl.h" #include "angle_gl.h"
#include <GLSLANG/ShaderLang.h> #include <GLSLANG/ShaderLang.h>
#include <cstddef>
namespace sh namespace sh
{ {
......
src/common/shadervars.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// Methods for GL variable types (varyings, uniforms, etc) // Methods for GL variable types (varyings, uniforms, etc)
// //
#include "common/shadervars.h" #include <GLSLANG/ShaderVars.h>
namespace sh namespace sh
{ {
......
src/compiler.gypi
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
'../include/GLES3/gl3ext.h', '../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h', '../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h', '../include/GLSLANG/ShaderLang.h',
'../include/GLSLANG/ShaderVars.h',
'../include/KHR/khrplatform.h', '../include/KHR/khrplatform.h',
'../include/angle_gl.h', '../include/angle_gl.h',
'common/RefCountObject.cpp', 'common/RefCountObject.cpp',
...@@ -33,7 +34,6 @@ ...@@ -33,7 +34,6 @@
'common/mathutil.h', 'common/mathutil.h',
'common/platform.h', 'common/platform.h',
'common/shadervars.cpp', 'common/shadervars.cpp',
'common/shadervars.h',
'common/tls.cpp', 'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
......
src/compiler/translator/OutputHLSL.h
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include <map> #include <map>
#include "angle_gl.h" #include "angle_gl.h"
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseContext.h" #include "compiler/translator/ParseContext.h"
#include "common/shadervars.h"
namespace sh namespace sh
{ {
......
src/compiler/translator/TranslatorHLSL.h
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#define COMPILER_TRANSLATORHLSL_H_ #define COMPILER_TRANSLATORHLSL_H_
#include "compiler/translator/Compiler.h" #include "compiler/translator/Compiler.h"
#include "common/shadervars.h"
class TranslatorHLSL : public TCompiler class TranslatorHLSL : public TCompiler
{ {
......
src/compiler/translator/UniformHLSL.h
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#ifndef TRANSLATOR_UNIFORMHLSL_H_ #ifndef TRANSLATOR_UNIFORMHLSL_H_
#define TRANSLATOR_UNIFORMHLSL_H_ #define TRANSLATOR_UNIFORMHLSL_H_
#include "common/shadervars.h"
#include "compiler/translator/Types.h" #include "compiler/translator/Types.h"
namespace sh namespace sh
......
src/compiler/translator/VariableInfo.h
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
#ifndef COMPILER_VARIABLE_INFO_H_ #ifndef COMPILER_VARIABLE_INFO_H_
#define COMPILER_VARIABLE_INFO_H_ #define COMPILER_VARIABLE_INFO_H_
#include <GLSLANG/ShaderVars.h>
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "common/shadervars.h"
// Traverses intermediate tree to collect all attributes, uniforms, varyings. // Traverses intermediate tree to collect all attributes, uniforms, varyings.
class CollectVariables : public TIntermTraverser class CollectVariables : public TIntermTraverser
......
src/compiler/translator/util.cpp
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <limits> #include <limits>
#include "compiler/preprocessor/numeric_lex.h" #include "compiler/preprocessor/numeric_lex.h"
#include "common/shadervars.h"
#include "common/utilities.h" #include "common/utilities.h"
bool atof_clamp(const char *str, float *value) bool atof_clamp(const char *str, float *value)
......
src/compiler/translator/util.h
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
#include <stack> #include <stack>
#include "compiler/translator/Types.h"
#include "angle_gl.h" #include "angle_gl.h"
#include "common/shadervars.h" #include <GLSLANG/ShaderVars.h>
#include "compiler/translator/Types.h"
// atof_clamp is like atof but // atof_clamp is like atof but
// 1. it forces C locale, i.e. forcing '.' as decimal point. // 1. it forces C locale, i.e. forcing '.' as decimal point.
......
src/libEGL.gypi
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
'../include/GLES3/gl3ext.h', '../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h', '../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h', '../include/GLSLANG/ShaderLang.h',
'../include/GLSLANG/ShaderVars.h',
'../include/KHR/khrplatform.h', '../include/KHR/khrplatform.h',
'../include/angle_gl.h', '../include/angle_gl.h',
'common/RefCountObject.cpp', 'common/RefCountObject.cpp',
...@@ -35,7 +36,6 @@ ...@@ -35,7 +36,6 @@
'common/mathutil.h', 'common/mathutil.h',
'common/platform.h', 'common/platform.h',
'common/shadervars.cpp', 'common/shadervars.cpp',
'common/shadervars.h',
'common/tls.cpp', 'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
......
src/libGLESv2.gypi
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
'../include/GLES3/gl3ext.h', '../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h', '../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h', '../include/GLSLANG/ShaderLang.h',
'../include/GLSLANG/ShaderVars.h',
'../include/KHR/khrplatform.h', '../include/KHR/khrplatform.h',
'../include/angle_gl.h', '../include/angle_gl.h',
'common/RefCountObject.cpp', 'common/RefCountObject.cpp',
...@@ -35,7 +36,6 @@ ...@@ -35,7 +36,6 @@
'common/mathutil.h', 'common/mathutil.h',
'common/platform.h', 'common/platform.h',
'common/shadervars.cpp', 'common/shadervars.cpp',
'common/shadervars.h',
'common/tls.cpp', 'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
......
src/libGLESv2/Shader.h
...@@ -12,15 +12,16 @@ ...@@ -12,15 +12,16 @@
#ifndef LIBGLESV2_SHADER_H_ #ifndef LIBGLESV2_SHADER_H_
#define LIBGLESV2_SHADER_H_ #define LIBGLESV2_SHADER_H_
#include "angle_gl.h"
#include <string> #include <string>
#include <list> #include <list>
#include <vector> #include <vector>
#include "common/shadervars.h" #include "angle_gl.h"
#include <GLSLANG/ShaderVars.h>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libGLESv2/angletypes.h" #include "libGLESv2/angletypes.h"
#include "GLSLANG/ShaderLang.h"
namespace rx namespace rx
{ {
......
src/libGLESv2/Uniform.h
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "common/debug.h" #include "common/debug.h"
#include "angletypes.h" #include "angletypes.h"
#include "common/shadervars.h"
#include "common/blocklayout.h" #include "common/blocklayout.h"
namespace gl namespace gl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment