ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx-ogl: delete various leftovers

This commit is contained in:
Gregory Hainaut 2015-08-20 22:39:12 +02:00
parent 7002ff3ec3
commit a46c11b088
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GLState.cpp
View File

@ -50,7 +50,6 @@ namespace GLState {
GLuint ds; GLuint ds;
GLuint tex_unit[4]; GLuint tex_unit[4];
GLuint64 tex_handle[4]; GLuint64 tex_handle[4];
bool dirty_ressources;
GLuint ps; GLuint ps;
GLuint gs; GLuint gs;
@ -93,7 +92,6 @@ namespace GLState {
gs = 0; gs = 0;
vs = 0; vs = 0;
program = 0; program = 0;
dirty_prog = false; dirty_prog = true;
dirty_ressources = false;
} }
} }

1
plugins/GSdx/GLState.h
View File

@ -58,7 +58,6 @@ namespace GLState {
extern GLuint vs; extern GLuint vs;
extern GLuint program; // monolith program (when sso isn't supported) extern GLuint program; // monolith program (when sso isn't supported)
extern bool dirty_prog; extern bool dirty_prog;
extern bool dirty_ressources;
extern void Clear(); extern void Clear();
} }

5
plugins/GSdx/GSRendererOGL.cpp
View File

@ -856,11 +856,8 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
ps_sel.tcoffsethack = !!UserHacks_TCOffset; ps_sel.tcoffsethack = !!UserHacks_TCOffset;
ps_cb.TC_OH_TS = GSVector4(1/16.0f, 1/16.0f, UserHacks_TCO_x, UserHacks_TCO_y).xyxy() / WH.xyxy(); ps_cb.TC_OH_TS = GSVector4(1/16.0f, 1/16.0f, UserHacks_TCO_x, UserHacks_TCO_y).xyxy() / WH.xyxy();
GSVector4 clamp(ps_cb.MskFix);
GSVector4 ta(m_env.TEXA & GSVector4i::x000000ff()); GSVector4 ta(m_env.TEXA & GSVector4i::x000000ff());
ps_cb.MinF_TA = ta.xyxy() / WH.xyxy(GSVector4(255, 255));
ps_cb.MinMax = clamp / WH.xyxy();
ps_cb.MinF_TA = (clamp + 0.5f).xyxy(ta) / WH.xyxy(GSVector4(255, 255));
// Only enable clamping in CLAMP mode. REGION_CLAMP will be done manually in the shader // Only enable clamping in CLAMP mode. REGION_CLAMP will be done manually in the shader
ps_ssel.tau = (m_context->CLAMP.WMS != CLAMP_CLAMP); ps_ssel.tau = (m_context->CLAMP.WMS != CLAMP_CLAMP);

3
plugins/GSdx/GSShaderOGL.cpp
View File

@ -64,7 +64,6 @@ void GSShaderOGL::PS(GLuint s)
// In debug always sets the program. It allow to replace the program in apitrace easily. // In debug always sets the program. It allow to replace the program in apitrace easily.
GLState::ps = s; GLState::ps = s;
GLState::dirty_prog = true; GLState::dirty_prog = true;
GLState::dirty_ressources = true;
if (GLLoader::found_GL_ARB_separate_shader_objects) { if (GLLoader::found_GL_ARB_separate_shader_objects) {
gl_UseProgramStages(m_pipeline, GL_FRAGMENT_SHADER_BIT, s); gl_UseProgramStages(m_pipeline, GL_FRAGMENT_SHADER_BIT, s);
} }
@ -166,8 +165,6 @@ void GSShaderOGL::UseProgram()
{ {
if (GLState::dirty_prog) { if (GLState::dirty_prog) {
if (!GLLoader::found_GL_ARB_separate_shader_objects) { if (!GLLoader::found_GL_ARB_separate_shader_objects) {
GLState::dirty_ressources = true;
hash_map<uint64, GLuint >::iterator it; hash_map<uint64, GLuint >::iterator it;
// Note: shader are integer lookup pointer. They start from 1 and incr // Note: shader are integer lookup pointer. They start from 1 and incr
// every time you create a new shader OR a new program. // every time you create a new shader OR a new program.

2
plugins/GSdx/res/glsl/tfx_fs.glsl
View File

@ -67,7 +67,7 @@ layout(std140, binding = 21) uniform cb21
vec4 WH; vec4 WH;
vec2 MinF; vec2 _pad0;
vec2 TA; vec2 TA;
uvec4 MskFix; uvec4 MskFix;

2
plugins/GSdx/res/glsl/tfx_vgs.glsl
View File

@ -16,7 +16,7 @@ layout(std140, binding = 21) uniform cb21
vec4 WH; vec4 WH;
vec2 MinF; vec2 _pad0;
vec2 TA; vec2 TA;
uvec4 MskFix; uvec4 MskFix;

4
plugins/GSdx/res/glsl_source.h
View File

@ -622,7 +622,7 @@ static const char* tfx_vgs_glsl =
"\n" "\n"
" vec4 WH;\n" " vec4 WH;\n"
"\n" "\n"
" vec2 MinF;\n" " vec2 _pad0;\n"
" vec2 TA;\n" " vec2 TA;\n"
"\n" "\n"
" uvec4 MskFix;\n" " uvec4 MskFix;\n"
@ -952,7 +952,7 @@ static const char* tfx_fs_all_glsl =
"\n" "\n"
" vec4 WH;\n" " vec4 WH;\n"
"\n" "\n"
" vec2 MinF;\n" " vec2 _pad0;\n"
" vec2 TA;\n" " vec2 TA;\n"
"\n" "\n"
" uvec4 MskFix;\n" " uvec4 MskFix;\n"