Browse Source

OpenGL: Move Attributes enum to a more appropriate file

nce_cpp
Yuri Kunde Schlesner 9 years ago
parent
commit
f510fe1b2e
  1. 1
      src/video_core/renderer_opengl/gl_rasterizer.cpp
  2. 11
      src/video_core/renderer_opengl/gl_shader_gen.h
  3. 11
      src/video_core/renderer_opengl/gl_shader_util.h

1
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"

11
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

11
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

Loading…
Cancel
Save