Skip to content

A
angle
Commit 1293cf4b by Shannon Woods Committed by Gerrit Code Review
Options

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
parents 00a8465b 26533604
Showing with 5 additions and 5 deletions
src/libGLESv2/renderer/d3d11/Blit11.h
...@@ -65,7 +65,7 @@ class Blit11 ...@@ -65,7 +65,7 @@ class Blit11
void *outVertices, unsigned int *outStride, unsigned int *outVertexCount, void *outVertices, unsigned int *outStride, unsigned int *outVertexCount,
D3D11_PRIMITIVE_TOPOLOGY *outTopology); D3D11_PRIMITIVE_TOPOLOGY *outTopology);
struct BlitShader struct Shader
{ {
WriteVertexFunction mVertexWriteFunction; WriteVertexFunction mVertexWriteFunction;
ID3D11InputLayout *mInputLayout; ID3D11InputLayout *mInputLayout;
...@@ -75,11 +75,11 @@ class Blit11 ...@@ -75,11 +75,11 @@ class Blit11
}; };
typedef bool (*BlitParametersComparisonFunction)(const BlitParameters&, const BlitParameters &); typedef bool (*BlitParametersComparisonFunction)(const BlitParameters&, const BlitParameters &);
typedef std::map<BlitParameters, BlitShader, BlitParametersComparisonFunction> BlitShaderMap; typedef std::map<BlitParameters, Shader, BlitParametersComparisonFunction> BlitShaderMap;
BlitShaderMap mShaderMap; BlitShaderMap mBlitShaderMap;
void add2DShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps); void add2DBlitShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);
void add3DShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps); void add3DBlitShaderToMap(GLenum destFormat, bool signedInteger, ID3D11PixelShader *ps);
void buildShaderMap(); void buildShaderMap();
void clearShaderMap(); void clearShaderMap();
......
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