Merge "Renamed some Blit11 types and methods to imply they are for blitting (as…

Merge "Renamed some Blit11 types and methods to imply they are for blitting (as opposed to swizzleing)." into es3proto

Merge "Renamed some Blit11 types and methods to imply they are for blitting (as…
1293cf4b · Shannon Woods · Gerrit Code Review · 00a8465b · 26533604 · 1293cf4b
Commit 1293cf4b authored Nov 21, 2013 by Shannon Woods Committed by Gerrit Code Review Nov 21, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Blit11.cpp src/libGLESv2/renderer/d3d11/Blit11.cpp +0 -0

Blit11.h src/libGLESv2/renderer/d3d11/Blit11.h +5 -5

No files found.
--- a/src/libGLESv2/renderer/d3d11/Blit11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Blit11.cpp
--- a/src/libGLESv2/renderer/d3d11/Blit11.h
+++ b/src/libGLESv2/renderer/d3d11/Blit11.h
@@ -65,7 +65,7 @@ class Blit11
                                        void *outVertices, unsigned int *outStride, unsigned int *outVertexCount,
                                        D3D11_PRIMITIVE_TOPOLOGY *outTopology);

-    struct BlitShader
+    struct Shader
    {
        WriteVertexFunction mVertexWriteFunction;
        ID3D11InputLayout *mInputLayout;
@@ -75,11 +75,11 @@ class Blit11
    };

    typedef bool (*BlitParametersComparisonFunction)(const BlitParameters&, const BlitParameters &);
-    typedef std::map<BlitParameters, BlitShader, BlitParametersComparisonFunction> BlitShaderMap;
-    BlitShaderMap mShaderMap;
+    typedef std::map<BlitParameters, Shader, BlitParametersComparisonFunction> BlitShaderMap;
+    BlitShaderMap mBlitShaderMap;

-    void add2DShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);
-    void add3DShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);
+    void add2DBlitShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);
+    void add3DBlitShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);

    void buildShaderMap();
    void clearShaderMap();