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

glsl: Use core-compatible OpenGL calls. 

* Remove glTexCoordPointer because it wasn't affecting anything
anyway.
* Use GL_TRIANGLE_STRIP instead of deprecated GL_QUADS.
This commit is contained in:
Brandon Wright 2018-10-27 18:00:15 -05:00
parent 8c8e04fec2
commit b84a8fbd5b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shaders/glsl.cpp
View File

@ -3,8 +3,8 @@
#include "shader_helpers.h" #include "shader_helpers.h"
#include "shader_platform.h" #include "shader_platform.h"
static const GLfloat tex_coords[16] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, static const GLfloat tex_coords[16] = { 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f,
0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f }; 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f };
static const GLfloat mvp_ortho[16] = { 2.0f, 0.0f, 0.0f, 0.0f, static const GLfloat mvp_ortho[16] = { 2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f,
0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f,
@ -685,14 +685,12 @@ void GLSLShader::render(GLuint &orig,
GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_T,
pass[i].wrap_mode); pass[i].wrap_mode);
glTexCoordPointer(2, GL_FLOAT, 0, tex_coords + (lastpass ? 8 : 0));
glUseProgram (pass[i].program); glUseProgram (pass[i].program);
set_shader_vars(i); set_shader_vars(i);
glClearColor(0.0f, 0.0f, 0.0f, 0.5f); glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glDrawArrays(GL_QUADS, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
// reset vertex attribs set in set_shader_vars // reset vertex attribs set in set_shader_vars
clear_shader_vars(); clear_shader_vars();
@ -738,7 +736,6 @@ void GLSLShader::render(GLuint &orig,
glBindTexture(GL_TEXTURE_2D, orig); glBindTexture(GL_TEXTURE_2D, orig);
glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint)pass.back().width); glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint)pass.back().width);
glTexCoordPointer(2, GL_FLOAT, 0, tex_coords + 8);
} }
void GLSLShader::register_uniforms () void GLSLShader::register_uniforms ()