diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-04-17 05:47:04 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-04-17 05:47:04 +0200 |
| commit | 40e28f62170b0031e9430a9ae6045e4852aa40cc (patch) | |
| tree | 4811c51642b3776cb9e3e6afacc8340c7d0721f4 | |
| parent | Merge pull request #2659 from MerryMage/dsp_dsp-correction (diff) | |
| download | yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar.gz yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar.bz2 yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar.lz yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar.xz yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.tar.zst yuzu-40e28f62170b0031e9430a9ae6045e4852aa40cc.zip | |
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.h | 11 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_util.h | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index de1d5eba7..1e7022fb9 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -20,7 +20,6 @@ #include "video_core/regs_texturing.h" #include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_shader_gen.h" -#include "video_core/renderer_opengl/gl_shader_util.h" #include "video_core/renderer_opengl/pica_to_gl.h" #include "video_core/renderer_opengl/renderer_opengl.h" diff --git a/src/video_core/renderer_opengl/gl_shader_gen.h b/src/video_core/renderer_opengl/gl_shader_gen.h index bef3249cf..7ec3bb53f 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.h +++ b/src/video_core/renderer_opengl/gl_shader_gen.h @@ -10,6 +10,17 @@ union PicaShaderConfig; namespace GLShader { +enum Attributes { + ATTRIBUTE_POSITION, + ATTRIBUTE_COLOR, + ATTRIBUTE_TEXCOORD0, + ATTRIBUTE_TEXCOORD1, + ATTRIBUTE_TEXCOORD2, + ATTRIBUTE_TEXCOORD0_W, + ATTRIBUTE_NORMQUAT, + ATTRIBUTE_VIEW, +}; + /** * Generates the GLSL vertex shader program source code for the current Pica state * @returns String of the shader source code diff --git a/src/video_core/renderer_opengl/gl_shader_util.h b/src/video_core/renderer_opengl/gl_shader_util.h index f59912f79..c66e8acd3 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.h +++ b/src/video_core/renderer_opengl/gl_shader_util.h @@ -8,17 +8,6 @@ namespace GLShader { -enum Attributes { - ATTRIBUTE_POSITION, - ATTRIBUTE_COLOR, - ATTRIBUTE_TEXCOORD0, - ATTRIBUTE_TEXCOORD1, - ATTRIBUTE_TEXCOORD2, - ATTRIBUTE_TEXCOORD0_W, - ATTRIBUTE_NORMQUAT, - ATTRIBUTE_VIEW, -}; - /** * Utility function to create and compile an OpenGL GLSL shader program (vertex + fragment shader) * @param vertex_shader String of the GLSL vertex shader program |