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

Revert "Use uniform buffer objects" 

This reverts commit 4646ba9c48.
This commit is contained in:
espes 2016-02-02 19:04:56 +10:00
parent 1fef6b47ef
commit dead1d9afc
3 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/xbox/nv2a.c
View File

@ -1652,8 +1652,6 @@ typedef struct PGRAPHState {
GLuint gl_element_buffer;
GLuint gl_memory_buffer;
GLuint gl_vertex_constants_buffer;
GLuint gl_vertex_array;
uint32_t regs[0x2000];
@ -3063,13 +3061,6 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
} else {
pg->shader_binding = generate_shaders(state);
/* Bind uniform blocks */
if (pg->shader_binding->gl_constants_loc != GL_INVALID_INDEX) {
glUniformBlockBinding(pg->shader_binding->gl_program,
pg->shader_binding->gl_constants_loc,
0 /* FIXME: Use #define */);
}
/* cache it */
ShaderState *cache_state = g_malloc(sizeof(*cache_state));
memcpy(cache_state, &state, sizeof(*cache_state));
@ -3363,6 +3354,18 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
} else if (vertex_program) {
/* update vertex program constants */
for (i=0; i<NV2A_VERTEXSHADER_CONSTANTS; i++) {
VertexShaderConstant *constant = &pg->constants[i];
if (!constant->dirty && !binding_changed) continue;
GLint loc = pg->shader_binding->vsh_constant_loc[i];
//assert(loc != -1);
if (loc != -1) {
glUniform4fv(loc, 1, (const GLfloat*)constant->data);
}
constant->dirty = false;
}
GLint loc = glGetUniformLocation(pg->shader_binding->gl_program,
"surfaceSize");
if (loc != -1) {
@ -3377,23 +3380,6 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
}
}
/* Update constants */
if (pg->shader_binding->gl_constants_loc != GL_INVALID_INDEX) {
/* FIXME: Can be done on buffer creation? */
glBindBufferBase(GL_UNIFORM_BUFFER, 0 /* FIXME: Use def */,
pg->gl_vertex_constants_buffer);
for (i=0; i<NV2A_VERTEXSHADER_CONSTANTS; i++) {
VertexShaderConstant *constant = &pg->constants[i];
if (!constant->dirty) continue;
/* FIXME: Query GL_UNIFORM_ARRAY_STRIDE instead of assuming 16 */
glBufferSubData(GL_UNIFORM_BUFFER, i * 16, 16, constant->data);
constant->dirty = false;
}
}
NV2A_GL_DGROUP_END();
}
@ -3803,13 +3789,6 @@ static void pgraph_init(NV2AState *d)
glGenBuffers(1, &pg->gl_inline_array_buffer);
glGenBuffers(1, &pg->gl_element_buffer);
glGenBuffers(1, &pg->gl_vertex_constants_buffer);
glBindBuffer(GL_UNIFORM_BUFFER, pg->gl_vertex_constants_buffer);
glBufferData(GL_UNIFORM_BUFFER,
16 * NV2A_VERTEXSHADER_CONSTANTS,
NULL,
GL_DYNAMIC_DRAW);
glGenBuffers(1, &pg->gl_memory_buffer);
glBindBuffer(GL_ARRAY_BUFFER, pg->gl_memory_buffer);
glBufferData(GL_ARRAY_BUFFER,

14
hw/xbox/nv2a_shaders.c
View File

@ -573,9 +573,7 @@ static QString *generate_vertex_shader(const ShaderState state,
"uniform vec2 surfaceSize;\n"
"\n"
/* All constants in 1 array declaration */
"layout(shared) uniform VertexConstants {\n"
" uniform vec4 c[192];\n"
"};\n"
"uniform vec4 c[192];\n"
"\n"
/* FIXME: Most [all?] of these are probably part of the constant space */
"uniform vec4 fogColor;\n"
@ -874,8 +872,14 @@ ShaderBinding* generate_shaders(const ShaderState state)
ret->psh_constant_loc[i][j] = glGetUniformLocation(program, tmp);
}
}
ret->gl_constants_loc = glGetUniformBlockIndex(program, "VertexConstants");
if (state.vertex_program) {
/* lookup vertex shader bindings */
for(i = 0; i < NV2A_VERTEXSHADER_CONSTANTS; i++) {
char tmp[8];
snprintf(tmp, sizeof(tmp), "c[%d]", i);
ret->vsh_constant_loc[i] = glGetUniformLocation(program, tmp);
}
}
return ret;
}

2
hw/xbox/nv2a_shaders.h
View File

@ -86,7 +86,7 @@ typedef struct ShaderBinding {
GLuint gl_program;
GLenum gl_primitive_mode;
GLint psh_constant_loc[9][2];
GLint gl_constants_loc;
GLint vsh_constant_loc[NV2A_VERTEXSHADER_CONSTANTS];
} ShaderBinding;
ShaderBinding* generate_shaders(const ShaderState state);