Move the implementations of shader var init to the header.
Making the contructors for shader variables inline saves us from
exporting them across DLL boundaries. This makes it easier to use
them in the translator when building the translator as a DLL.
BUG=angle:466
Change-Id: Iee0556e06dc1f9e98fe9eea6577819305de0dd0b
Reviewed-on: https://chromium-review.googlesource.com/198555
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/projects/src/libEGL.vcxproj b/projects/src/libEGL.vcxproj
index f8f6f86..b98c181 100644
--- a/projects/src/libEGL.vcxproj
+++ b/projects/src/libEGL.vcxproj
@@ -152,7 +152,6 @@
<ClCompile Include="..\..\src\common\debug.cpp"/>
<ClCompile Include="..\..\src\common\event_tracer.cpp"/>
<ClCompile Include="..\..\src\common\utilities.cpp"/>
- <ClCompile Include="..\..\src\common\shadervars.cpp"/>
<ClCompile Include="..\..\src\common\blocklayout.cpp"/>
</ItemGroup>
<ItemGroup>
diff --git a/projects/src/libEGL.vcxproj.filters b/projects/src/libEGL.vcxproj.filters
index 5d9f9a9..5994e46 100644
--- a/projects/src/libEGL.vcxproj.filters
+++ b/projects/src/libEGL.vcxproj.filters
@@ -102,9 +102,6 @@
<ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>src\common</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\common\shadervars.cpp">
- <Filter>src\common</Filter>
- </ClCompile>
<ClInclude Include="..\..\src\common\angleutils.h">
<Filter>src\common</Filter>
</ClInclude>
diff --git a/projects/src/libGLESv2.vcxproj b/projects/src/libGLESv2.vcxproj
index e85b0a8..245208c 100644
--- a/projects/src/libGLESv2.vcxproj
+++ b/projects/src/libGLESv2.vcxproj
@@ -113,104 +113,124 @@
<ItemGroup>
<None Include="..\..\src\angle.gyp"/>
<None Include="..\..\src\libGLESv2\libGLESv2.def"/>
- <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl"/>
- <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl"/>
+ <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl"/>
+ <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps"/>
<None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.vs"/>
<None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\generate_shaders.bat"/>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\src\libGLESv2\resource.h"/>
<ClInclude Include="..\..\src\libGLESv2\Shader.h"/>
<ClInclude Include="..\..\src\libGLESv2\BinaryStream.h"/>
- <ClInclude Include="..\..\src\libGLESv2\resource.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\Program.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\main.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"/>
<ClInclude Include="..\..\src\libGLESv2\precompiled.h"/>
<ClInclude Include="..\..\src\libGLESv2\TransformFeedback.h"/>
<ClInclude Include="..\..\src\libGLESv2\Context.h"/>
<ClInclude Include="..\..\src\libGLESv2\Query.h"/>
- <ClInclude Include="..\..\src\libGLESv2\Texture.h"/>
- <ClInclude Include="..\..\src\libGLESv2\VertexArray.h"/>
- <ClInclude Include="..\..\src\libGLESv2\Uniform.h"/>
- <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h"/>
- <ClInclude Include="..\..\src\libGLESv2\constants.h"/>
- <ClInclude Include="..\..\src\libGLESv2\Buffer.h"/>
- <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h"/>
- <ClInclude Include="..\..\src\libGLESv2\validationES.h"/>
- <ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
- <ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
- <ClInclude Include="..\..\src\libGLESv2\Program.h"/>
- <ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
- <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"/>
<ClInclude Include="..\..\src\libGLESv2\ResourceManager.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\Texture.h"/>
<ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h"/>
- <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\Buffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\validationES2.h"/>
<ClInclude Include="..\..\src\libGLESv2\Fence.h"/>
<ClInclude Include="..\..\src\libGLESv2\angletypes.h"/>
- <ClInclude Include="..\..\src\libGLESv2\main.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\Uniform.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\constants.h"/>
<ClInclude Include="..\..\src\libGLESv2\Framebuffer.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\VertexArray.h"/>
<ClInclude Include="..\..\src\libGLESv2\formatutils.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\validationES.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexDataManager.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexRangeCache.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\FenceImpl.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\Image.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\generatemip.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\VertexDataManager.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\VertexBuffer.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_gs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2dui11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4f.h"/>
@@ -218,69 +238,49 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h"/>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h"/>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\luminanceps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\passthroughps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\flipyvs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\componentmaskps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\standardvs.h"/>
+ <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/>
+ <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\blocklayout.h"/>
<ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\shadervars.h"/>
+ <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/>
- <ClInclude Include="..\..\src\common\RefCountObject.h"/>
- <ClInclude Include="..\..\src\common\event_tracer.h"/>
- <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
+ <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
<ClInclude Include="..\..\include\GLES2\gl2.h"/>
- <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
<ClInclude Include="..\..\include\GLES3\gl3ext.h"/>
<ClInclude Include="..\..\include\GLES3\gl3.h"/>
<ClInclude Include="..\..\include\GLES3\gl3platform.h"/>
@@ -289,87 +289,86 @@
<ClInclude Include="..\..\include\EGL\eglplatform.h"/>
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\validationES2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\precompiled.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\DynamicHLSL.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\Context.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Fence.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\validationES.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\Program.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Query.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\Context.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Buffer.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Shader.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Uniform.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\main.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\Program.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexRangeCache.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\Renderer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\TextureStorage.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Image11.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Image9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp"/>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp"/>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp"/>
<ClCompile Include="..\..\src\common\event_tracer.cpp"/>
- <ClCompile Include="..\..\src\common\blocklayout.cpp"/>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"/>
<ClCompile Include="..\..\src\common\utilities.cpp"/>
- <ClCompile Include="..\..\src\common\mathutil.cpp"/>
<ClCompile Include="..\..\src\common\debug.cpp"/>
- <ClCompile Include="..\..\src\common\shadervars.cpp"/>
+ <ClCompile Include="..\..\src\common\mathutil.cpp"/>
+ <ClCompile Include="..\..\src\common\blocklayout.cpp"/>
<ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp"/>
</ItemGroup>
<ItemGroup>
diff --git a/projects/src/libGLESv2.vcxproj.filters b/projects/src/libGLESv2.vcxproj.filters
index 7210398..d9cabcf 100644
--- a/projects/src/libGLESv2.vcxproj.filters
+++ b/projects/src/libGLESv2.vcxproj.filters
@@ -63,6 +63,12 @@
<None Include="..\..\src\angle.gyp">
<Filter>src</Filter>
</None>
+ <ClInclude Include="..\..\src\libGLESv2\resource.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\Shader.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
@@ -72,7 +78,7 @@
<ClInclude Include="..\..\src\libGLESv2\BinaryStream.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\resource.h">
+ <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\precompiled.cpp">
@@ -81,18 +87,39 @@
<ClCompile Include="..\..\src\libGLESv2\DynamicHLSL.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\queryconversions.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\validationES3.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\Program.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\main.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\Sampler.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp">
+ <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
<Filter>src\libGLESv2</Filter>
- </ClCompile>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\precompiled.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\TransformFeedback.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
@@ -102,100 +129,37 @@
<ClInclude Include="..\..\src\libGLESv2\Query.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\Fence.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\Texture.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\Uniform.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\Program.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <None Include="..\..\src\libGLESv2\libGLESv2.def">
- <Filter>src\libGLESv2</Filter>
- </None>
- <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\constants.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\Query.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\validationES.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\queryconversions.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\validationES3.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\Program.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\Sampler.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
- <Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\ResourceManager.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
<ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc">
<Filter>src\libGLESv2</Filter>
</ResourceCompile>
+ <ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\Texture.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\Context.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\Fence.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h">
+ <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\validationES2.h">
@@ -204,13 +168,22 @@
<ClInclude Include="..\..\src\libGLESv2\Fence.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp">
+ <ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\angletypes.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp">
+ <ClInclude Include="..\..\src\libGLESv2\Uniform.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\Query.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Shader.cpp">
@@ -219,30 +192,57 @@
<ClCompile Include="..\..\src\libGLESv2\Uniform.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\main.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\main.h">
+ <ClInclude Include="..\..\src\libGLESv2\constants.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp">
- <Filter>src\libGLESv2</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
+ <ClCompile Include="..\..\src\libGLESv2\main.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\Framebuffer.h">
<Filter>src\libGLESv2</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\formatutils.h">
+ <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp">
<Filter>src\libGLESv2</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp">
+ </ClCompile>
+ <None Include="..\..\src\libGLESv2\libGLESv2.def">
+ <Filter>src\libGLESv2</Filter>
+ </None>
+ <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp">
<Filter>src\libGLESv2</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\formatutils.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\Program.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp">
+ <Filter>src\libGLESv2</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\validationES.h">
+ <Filter>src\libGLESv2</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexDataManager.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
@@ -252,21 +252,42 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp">
<Filter>src\libGLESv2\renderer</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp">
<Filter>src\libGLESv2\renderer</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
@@ -276,60 +297,39 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\IndexRangeCache.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\FenceImpl.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\Image.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\generatemip.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h">
- <Filter>src\libGLESv2\renderer</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\VertexDataManager.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexRangeCache.cpp">
<Filter>src\libGLESv2\renderer</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h">
+ <Filter>src\libGLESv2\renderer</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\VertexBuffer.h">
<Filter>src\libGLESv2\renderer</Filter>
</ClInclude>
@@ -339,18 +339,30 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\TextureStorage.cpp">
<Filter>src\libGLESv2\renderer</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp">
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
@@ -360,12 +372,24 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
@@ -375,63 +399,39 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h">
- <Filter>src\libGLESv2\renderer\d3d11</Filter>
- </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h">
+ <Filter>src\libGLESv2\renderer\d3d11</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.h">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClInclude>
@@ -441,18 +441,12 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Image11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
<Filter>src\libGLESv2\renderer\d3d11</Filter>
</ClCompile>
- <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
- <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
- </None>
- <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl">
- <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
- </None>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
<Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
</None>
@@ -462,9 +456,15 @@
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl">
<Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
</None>
+ <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
+ </None>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl">
<Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
</None>
+ <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
+ </None>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2di11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
@@ -474,22 +474,40 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h">
@@ -498,30 +516,72 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
@@ -543,81 +603,21 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h">
- <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h">
+ <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3dui11ps.h">
<Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
@@ -627,6 +627,9 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.h">
<Filter>src\libGLESv2\renderer\d3d</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
@@ -636,30 +639,42 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Image9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
+ </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h">
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
+ </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
@@ -669,55 +684,40 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
- <Filter>src\libGLESv2\renderer\d3d9</Filter>
- </ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClCompile>
- <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp">
+ <Filter>src\libGLESv2\renderer\d3d9</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h">
<Filter>src\libGLESv2\renderer\d3d9</Filter>
</ClInclude>
<None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps">
@@ -744,75 +744,72 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\standardvs.h">
<Filter>src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\common\RefCountObject.h">
+ <Filter>src\common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\common\mathutil.h">
<Filter>src\common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\common\event_tracer.h">
+ <Filter>src\common</Filter>
+ </ClInclude>
<ClCompile Include="..\..\src\common\event_tracer.cpp">
<Filter>src\common</Filter>
</ClCompile>
<ClInclude Include="..\..\src\common\blocklayout.h">
<Filter>src\common</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\common\debug.h">
- <Filter>src\common</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\common\shadervars.h">
- <Filter>src\common</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\common\utilities.h">
- <Filter>src\common</Filter>
- </ClInclude>
- <ClCompile Include="..\..\src\common\blocklayout.cpp">
- <Filter>src\common</Filter>
- </ClCompile>
- <ClInclude Include="..\..\src\common\angleutils.h">
- <Filter>src\common</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\common\RefCountObject.h">
- <Filter>src\common</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\common\event_tracer.h">
- <Filter>src\common</Filter>
- </ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>src\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>src\common</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\common\mathutil.cpp">
- <Filter>src\common</Filter>
- </ClCompile>
<ClCompile Include="..\..\src\common\debug.cpp">
<Filter>src\common</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\common\shadervars.cpp">
+ <ClCompile Include="..\..\src\common\mathutil.cpp">
<Filter>src\common</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\common\debug.h">
+ <Filter>src\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\common\shadervars.h">
+ <Filter>src\common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\common\version.h">
<Filter>src\common</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h">
- <Filter>src\third_party\murmurhash</Filter>
+ <ClInclude Include="..\..\src\common\utilities.h">
+ <Filter>src\common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\common\angleutils.h">
+ <Filter>src\common</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\src\common\blocklayout.cpp">
+ <Filter>src\common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp">
<Filter>src\third_party\murmurhash</Filter>
</ClCompile>
+ <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h">
+ <Filter>src\third_party\murmurhash</Filter>
+ </ClInclude>
<ClInclude Include="..\..\include\KHR\khrplatform.h">
<Filter>include\KHR</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
<Filter>include\GLSLANG</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\GLES2\gl2platform.h">
+ <Filter>include\GLES2</Filter>
+ </ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2ext.h">
<Filter>include\GLES2</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2.h">
<Filter>include\GLES2</Filter>
</ClInclude>
- <ClInclude Include="..\..\include\GLES2\gl2platform.h">
- <Filter>include\GLES2</Filter>
- </ClInclude>
<ClInclude Include="..\..\include\GLES3\gl3ext.h">
<Filter>include\GLES3</Filter>
</ClInclude>
diff --git a/projects/src/translator_lib.vcxproj b/projects/src/translator_lib.vcxproj
index 45cf442..5925e74 100644
--- a/projects/src/translator_lib.vcxproj
+++ b/projects/src/translator_lib.vcxproj
@@ -204,7 +204,6 @@
<ClCompile Include="..\..\src\common\RefCountObject.cpp"/>
<ClCompile Include="..\..\src\common\mathutil.cpp"/>
<ClCompile Include="..\..\src\common\debug.cpp"/>
- <ClCompile Include="..\..\src\common\shadervars.cpp"/>
<ClCompile Include="..\..\src\common\blocklayout.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InfoSink.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\OutputESSL.cpp"/>
diff --git a/projects/src/translator_lib.vcxproj.filters b/projects/src/translator_lib.vcxproj.filters
index 904b4c8..13a3e41 100644
--- a/projects/src/translator_lib.vcxproj.filters
+++ b/projects/src/translator_lib.vcxproj.filters
@@ -96,9 +96,6 @@
<ClInclude Include="..\..\src\common\utilities.h">
<Filter>src\common</Filter>
</ClInclude>
- <ClCompile Include="..\..\src\common\shadervars.cpp">
- <Filter>src\common</Filter>
- </ClCompile>
<ClCompile Include="..\..\src\common\blocklayout.cpp">
<Filter>src\common</Filter>
</ClCompile>
diff --git a/src/common/shadervars.cpp b/src/common/shadervars.cpp
deleted file mode 100644
index a8e9759..0000000
--- a/src/common/shadervars.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013-2014 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// shadervars.cpp:
-// Implementation for GL shader variable member functions.
-//
-
-#include "common/shadervars.h"
-
-namespace gl
-{
-
-ShaderVariable::ShaderVariable(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn)
- : type(typeIn),
- precision(precisionIn),
- name(nameIn),
- arraySize(arraySizeIn)
-{
-}
-
-Uniform::Uniform(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, unsigned int registerIndexIn, unsigned int elementIndexIn)
- : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
- registerIndex(registerIndexIn),
- elementIndex(elementIndexIn)
-{
-}
-
-Attribute::Attribute()
- : ShaderVariable(GL_NONE, GL_NONE, "", 0),
- location(-1)
-{
-}
-
-Attribute::Attribute(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, int locationIn)
- : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
- location(locationIn)
-{
-}
-
-InterfaceBlockField::InterfaceBlockField(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, bool isRowMajorMatrix)
- : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
- isRowMajorMatrix(isRowMajorMatrix)
-{
-}
-
-Varying::Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, InterpolationType interpolationIn)
- : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
- interpolation(interpolationIn),
- registerIndex(GL_INVALID_INDEX),
- elementIndex(GL_INVALID_INDEX)
-{
-}
-
-void Varying::resetRegisterAssignment()
-{
- registerIndex = GL_INVALID_INDEX;
- elementIndex = GL_INVALID_INDEX;
-}
-
-BlockMemberInfo::BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
- : offset(offset),
- arrayStride(arrayStride),
- matrixStride(matrixStride),
- isRowMajorMatrix(isRowMajorMatrix)
-{
-}
-
-BlockMemberInfo BlockMemberInfo::getDefaultBlockInfo()
-{
- return BlockMemberInfo(-1, -1, -1, false);
-}
-
-InterfaceBlock::InterfaceBlock(const char *name, unsigned int arraySize, unsigned int registerIndex)
- : name(name),
- arraySize(arraySize),
- layout(BLOCKLAYOUT_SHARED),
- registerIndex(registerIndex),
- isRowMajorLayout(false)
-{
-}
-
-}
diff --git a/src/common/shadervars.h b/src/common/shadervars.h
index 9d66f0e..0d2285b 100644
--- a/src/common/shadervars.h
+++ b/src/common/shadervars.h
@@ -21,6 +21,7 @@
namespace gl
{
+// Varying interpolation qualifier, see section 4.3.9 of the ESSL 3.00.4 spec
enum InterpolationType
{
INTERPOLATION_SMOOTH,
@@ -28,6 +29,15 @@
INTERPOLATION_FLAT
};
+// Uniform block layout qualifier, see section 4.3.8.3 of the ESSL 3.00.4 spec
+enum BlockLayoutType
+{
+ BLOCKLAYOUT_STANDARD,
+ BLOCKLAYOUT_PACKED,
+ BLOCKLAYOUT_SHARED
+};
+
+// Base class for all variables defined in shaders, including Varyings, Uniforms, etc
struct ShaderVariable
{
GLenum type;
@@ -35,11 +45,18 @@
std::string name;
unsigned int arraySize;
- ShaderVariable(GLenum type, GLenum precision, const char *name, unsigned int arraySize);
+ ShaderVariable(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn)
+ : type(typeIn),
+ precision(precisionIn),
+ name(nameIn),
+ arraySize(arraySizeIn)
+ {}
+
bool isArray() const { return arraySize > 0; }
unsigned int elementCount() const { return std::max(1u, arraySize); }
};
+// Uniform registers (and element indices) are assigned when outputting shader code
struct Uniform : public ShaderVariable
{
unsigned int registerIndex;
@@ -47,7 +64,11 @@
std::vector<Uniform> fields;
Uniform(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn,
- unsigned int registerIndexIn, unsigned int elementIndexIn);
+ unsigned int registerIndexIn, unsigned int elementIndexIn)
+ : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
+ registerIndex(registerIndexIn),
+ elementIndex(elementIndexIn)
+ {}
bool isStruct() const { return !fields.empty(); }
};
@@ -56,8 +77,15 @@
{
int location;
- Attribute();
- Attribute(GLenum type, GLenum precision, const char *name, unsigned int arraySize, int location);
+ Attribute()
+ : ShaderVariable(GL_NONE, GL_NONE, "", 0),
+ location(-1)
+ {}
+
+ Attribute(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, int locationIn)
+ : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
+ location(locationIn)
+ {}
};
struct InterfaceBlockField : public ShaderVariable
@@ -65,7 +93,10 @@
bool isRowMajorMatrix;
std::vector<InterfaceBlockField> fields;
- InterfaceBlockField(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, bool isRowMajorMatrix);
+ InterfaceBlockField(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, bool isRowMajorMatrix)
+ : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
+ isRowMajorMatrix(isRowMajorMatrix)
+ {}
bool isStruct() const { return !fields.empty(); }
};
@@ -78,39 +109,47 @@
unsigned int elementIndex; // First register element for varyings, assigned during link
std::string structName;
- Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, InterpolationType interpolationIn);
+ Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, InterpolationType interpolationIn)
+ : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
+ interpolation(interpolationIn),
+ registerIndex(GL_INVALID_INDEX),
+ elementIndex(GL_INVALID_INDEX)
+ {}
bool isStruct() const { return !fields.empty(); }
bool registerAssigned() const { return registerIndex != GL_INVALID_INDEX; }
- void resetRegisterAssignment();
+ void resetRegisterAssignment()
+ {
+ registerIndex = GL_INVALID_INDEX;
+ elementIndex = GL_INVALID_INDEX;
+ }
};
struct BlockMemberInfo
{
- BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix);
-
int offset;
int arrayStride;
int matrixStride;
bool isRowMajorMatrix;
- static BlockMemberInfo getDefaultBlockInfo();
+ static BlockMemberInfo getDefaultBlockInfo()
+ {
+ return BlockMemberInfo(-1, -1, -1, false);
+ }
+
+ BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
+ : offset(offset),
+ arrayStride(arrayStride),
+ matrixStride(matrixStride),
+ isRowMajorMatrix(isRowMajorMatrix)
+ {}
};
typedef std::vector<BlockMemberInfo> BlockMemberInfoArray;
-enum BlockLayoutType
-{
- BLOCKLAYOUT_STANDARD,
- BLOCKLAYOUT_PACKED,
- BLOCKLAYOUT_SHARED
-};
-
struct InterfaceBlock
{
- InterfaceBlock(const char *name, unsigned int arraySize, unsigned int registerIndex);
-
std::string name;
unsigned int arraySize;
size_t dataSize;
@@ -120,6 +159,14 @@
std::vector<BlockMemberInfo> blockInfo;
unsigned int registerIndex;
+
+ InterfaceBlock(const char *name, unsigned int arraySize, unsigned int registerIndex)
+ : name(name),
+ arraySize(arraySize),
+ layout(BLOCKLAYOUT_SHARED),
+ registerIndex(registerIndex),
+ isRowMajorLayout(false)
+ {}
};
}
diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index c3924fa..3cb7e0e 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1574,9 +1574,9 @@
// special case for gl_DepthRange, the only built-in uniform (also a struct)
if (vertexShader->usesDepthRange() || fragmentShader->usesDepthRange())
{
- mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.near", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
- mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.far", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
- mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.diff", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
+ mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.near", 0, -1, BlockMemberInfo::getDefaultBlockInfo()));
+ mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.far", 0, -1, BlockMemberInfo::getDefaultBlockInfo()));
+ mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.diff", 0, -1, BlockMemberInfo::getDefaultBlockInfo()));
}
if (!linkUniformBlocks(infoLog, vertexShader->getInterfaceBlocks(), fragmentShader->getInterfaceBlocks()))
@@ -2022,7 +2022,8 @@
}
else
{
- uniform = new LinkedUniform(constant.type, constant.precision, constant.name, constant.arraySize, -1, gl::BlockMemberInfo::getDefaultBlockInfo());
+ uniform = new LinkedUniform(constant.type, constant.precision, constant.name, constant.arraySize,
+ -1, BlockMemberInfo::getDefaultBlockInfo());
uniform->registerElement = constant.elementIndex;
}
diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index be45825..eed8488 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -179,7 +179,7 @@
bool linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShader, VertexShader *vertexShader);
bool linkAttributes(InfoLog &infoLog, const AttributeBindings &attributeBindings, FragmentShader *fragmentShader, VertexShader *vertexShader);
- typedef BlockMemberInfoArray::const_iterator BlockInfoItr;
+ typedef std::vector<BlockMemberInfo>::const_iterator BlockInfoItr;
template <class ShaderVarType>
bool linkValidateFields(InfoLog &infoLog, const std::string &varName, const ShaderVarType &vertexVar, const ShaderVarType &fragmentVar);