diff --git a/GPU/GLES/FragmentShaderGenerator.cpp b/GPU/GLES/FragmentShaderGenerator.cpp index bc6745221b..330fbb229a 100644 --- a/GPU/GLES/FragmentShaderGenerator.cpp +++ b/GPU/GLES/FragmentShaderGenerator.cpp @@ -30,6 +30,7 @@ #include "Core/Config.h" #include "GPU/GLES/FragmentShaderGenerator.h" #include "GPU/GLES/Framebuffer.h" +#include "GPU/GLES/ShaderManager.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" @@ -385,7 +386,7 @@ static inline LogicOpReplaceType ReplaceLogicOpType() { // Here we must take all the bits of the gstate that determine what the fragment shader will // look like, and concatenate them together into an ID. -void ComputeFragmentShaderID(FragmentShaderID *id) { +void ComputeFragmentShaderID(ShaderID *id) { int id0 = 0; int id1 = 0; if (gstate.isModeClear()) { diff --git a/GPU/GLES/FragmentShaderGenerator.h b/GPU/GLES/FragmentShaderGenerator.h index 3ac95f86e4..11339ada13 100644 --- a/GPU/GLES/FragmentShaderGenerator.h +++ b/GPU/GLES/FragmentShaderGenerator.h @@ -19,29 +19,9 @@ #include "Globals.h" -struct FragmentShaderID { - FragmentShaderID() {clear();} - void clear() {d[0] = 0xFFFFFFFF; d[1] = 0xFFFFFFFF;} - u32 d[2]; - bool operator < (const FragmentShaderID &other) const { - for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) { - if (d[i] < other.d[i]) - return true; - if (d[i] > other.d[i]) - return false; - } - return false; - } - bool operator == (const FragmentShaderID &other) const { - for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) { - if (d[i] != other.d[i]) - return false; - } - return true; - } -}; +struct ShaderID; -void ComputeFragmentShaderID(FragmentShaderID *id); +void ComputeFragmentShaderID(ShaderID *id); void GenerateFragmentShader(char *buffer); enum StencilValueType { diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index e7365e1ae9..b0d24613d6 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -729,7 +729,7 @@ Shader *ShaderManager::ApplyVertexShader(int prim, u32 vertType) { bool useHWTransform = CanUseHardwareTransform(prim); - VertexShaderID VSID; + ShaderID VSID; ComputeVertexShaderID(&VSID, vertType, prim, useHWTransform); // Just update uniforms if this is the same shader as last time. @@ -771,7 +771,7 @@ Shader *ShaderManager::ApplyVertexShader(int prim, u32 vertType) { } LinkedShader *ShaderManager::ApplyFragmentShader(Shader *vs, int prim, u32 vertType) { - FragmentShaderID FSID; + ShaderID FSID; ComputeFragmentShaderID(&FSID); if (lastVShaderSame_ && FSID == lastFSID_) { lastShader_->UpdateUniforms(vertType); diff --git a/GPU/GLES/ShaderManager.h b/GPU/GLES/ShaderManager.h index 6bd83edca9..85db06a384 100644 --- a/GPU/GLES/ShaderManager.h +++ b/GPU/GLES/ShaderManager.h @@ -25,6 +25,28 @@ class Shader; +struct ShaderID { + ShaderID() { d[0] = 0xFFFFFFFF; } + void clear() { d[0] = 0xFFFFFFFF; } + u32 d[2]; + bool operator < (const ShaderID &other) const { + for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) { + if (d[i] < other.d[i]) + return true; + if (d[i] > other.d[i]) + return false; + } + return false; + } + bool operator == (const ShaderID &other) const { + for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) { + if (d[i] != other.d[i]) + return false; + } + return true; + } +}; + // Pre-fetched attrs and uniforms enum { ATTR_POSITION = 0, @@ -168,9 +190,7 @@ private: bool useHWTransform_; }; - -class ShaderManager -{ +class ShaderManager { public: ShaderManager(); ~ShaderManager(); @@ -209,17 +229,17 @@ private: bool lastVShaderSame_; - FragmentShaderID lastFSID_; - VertexShaderID lastVSID_; + ShaderID lastFSID_; + ShaderID lastVSID_; LinkedShader *lastShader_; u32 globalDirty_; u32 shaderSwitchDirty_; char *codeBuffer_; - typedef std::map FSCache; + typedef std::map FSCache; FSCache fsCache_; - typedef std::map VSCache; + typedef std::map VSCache; VSCache vsCache_; }; diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 777caadb18..1c70e795c8 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -1535,7 +1535,7 @@ void TextureCache::SetTexture(bool force) { if (maxLevel > 0 && g_Config.iTexScalingLevel == 1) { #ifndef USING_GLES2 if (badMipSizes) { - NOTICE_LOG(G3D, "Bad mipmap for texture sized %dx%dx%d - autogenerating", w, h, (int)format); + // WARN_LOG(G3D, "Bad mipmap for texture sized %dx%dx%d - autogenerating", w, h, (int)format); glGenerateMipmap(GL_TEXTURE_2D); } else { for (int i = 1; i <= maxLevel; i++) { diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index 107edf5c97..8e9ee291e4 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -370,7 +370,7 @@ void TransformDrawEngine::DecodeVertsStep() { int indexLowerBound = dc.indexLowerBound, indexUpperBound = dc.indexUpperBound; u32 indexType = dc.indexType; - if (indexType == GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT) { + if (indexType == (GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT)) { // Decode the verts and apply morphing. Simple. dec_->DecodeVerts(decoded + decodedVerts_ * (int)dec_->GetDecVtxFmt().stride, dc.verts, indexLowerBound, indexUpperBound); diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp index 97b16b5757..7ae7852a27 100644 --- a/GPU/GLES/VertexShaderGenerator.cpp +++ b/GPU/GLES/VertexShaderGenerator.cpp @@ -29,6 +29,7 @@ #include "GPU/GPUState.h" #include "Core/Config.h" #include "GPU/GLES/VertexShaderGenerator.h" +#include "GPU/GLES/ShaderManager.h" #include "GPU/Common/VertexDecoderCommon.h" // SDL 1.2 on Apple does not have support for OpenGL 3 and hence needs @@ -48,7 +49,7 @@ bool CanUseHardwareTransform(int prim) { } // prim so we can special case for RECTANGLES :( -void ComputeVertexShaderID(VertexShaderID *id, u32 vertType, int prim, bool useHWTransform) { +void ComputeVertexShaderID(ShaderID *id, u32 vertType, int prim, bool useHWTransform) { bool doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear(); bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX; bool doShadeMapping = gstate.getUVGenMode() == GE_TEXMAP_ENVIRONMENT_MAP; diff --git a/GPU/GLES/VertexShaderGenerator.h b/GPU/GLES/VertexShaderGenerator.h index a07a19fb0f..b5ac58e014 100644 --- a/GPU/GLES/VertexShaderGenerator.h +++ b/GPU/GLES/VertexShaderGenerator.h @@ -21,34 +21,9 @@ // #define USE_BONE_ARRAY -struct VertexShaderID -{ - VertexShaderID() {d[0] = 0xFFFFFFFF;} - void clear() {d[0] = 0xFFFFFFFF;} - u32 d[2]; - bool operator < (const VertexShaderID &other) const - { - for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) - { - if (d[i] < other.d[i]) - return true; - if (d[i] > other.d[i]) - return false; - } - return false; - } - bool operator == (const VertexShaderID &other) const - { - for (size_t i = 0; i < sizeof(d) / sizeof(u32); i++) - { - if (d[i] != other.d[i]) - return false; - } - return true; - } -}; +struct ShaderID; bool CanUseHardwareTransform(int prim); -void ComputeVertexShaderID(VertexShaderID *id, u32 vertexType, int prim, bool useHWTransform); +void ComputeVertexShaderID(ShaderID *id, u32 vertexType, int prim, bool useHWTransform); void GenerateVertexShader(int prim, u32 vertexType, char *buffer, bool useHWTransform);