OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 15:10:04 +00:00
Code Issues Projects Releases Wiki Activity

OpenGL: Move Attributes enum to a more appropriate file

Browse Source
This commit is contained in:
Yuri Kunde Schlesner 2017-04-16 20:47:04 -07:00
parent 6a72bd62b5
commit 40e28f6217
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -20,7 +20,6 @@
#include "video_core/regs_texturing.h" #include "video_core/regs_texturing.h"
#include "video_core/renderer_opengl/gl_rasterizer.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_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/pica_to_gl.h"
#include "video_core/renderer_opengl/renderer_opengl.h" #include "video_core/renderer_opengl/renderer_opengl.h"

11
src/video_core/renderer_opengl/gl_shader_gen.h
View File

@ -10,6 +10,17 @@ union PicaShaderConfig;
namespace GLShader { 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 * Generates the GLSL vertex shader program source code for the current Pica state
* @returns String of the shader source code * @returns String of the shader source code

11
src/video_core/renderer_opengl/gl_shader_util.h
View File

@ -8,17 +8,6 @@
namespace GLShader { 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) * Utility function to create and compile an OpenGL GLSL shader program (vertex + fragment shader)
* @param vertex_shader String of the GLSL vertex shader program * @param vertex_shader String of the GLSL vertex shader program