GLES: Merge the two ShaderID classes as they are identical.

I don't expect the number of bits required to grow or shrink massively for either type of shader in this backend.
This commit is contained in:
Henrik Rydgard committed 2014-12-14 19:24:11 +01:00
1 parent 31ba44bc5d
commit b4b7cd0722
8 files changed
+39 -62

No files matched your search

+2 -1
View File
@@ -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()) {
+2 -22
View File
@@ -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 {
+2 -2
View File
@@ -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);
+27 -7
View File
@@ -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<FragmentShaderID, Shader *> FSCache;
typedef std::map<ShaderID, Shader *> FSCache;
FSCache fsCache_;
typedef std::map<VertexShaderID, Shader *> VSCache;
typedef std::map<ShaderID, Shader *> VSCache;
VSCache vsCache_;
};
+1 -1
View File
@@ -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++) {
+1 -1
View File
@@ -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);
+2 -1
View File
@@ -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;
+2 -27
View File
@@ -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);