summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_rasterizer.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-02-04 06:03:20 +0100
committerbunnei <bunneidev@gmail.com>2016-02-05 23:20:23 +0100
commitaaa7beeda8be312294a32e620a172c33cb231866 (patch)
tree320f9eabc0af6556a74a2237f3462ef5c9490561 /src/video_core/renderer_opengl/gl_rasterizer.h
parentgl_rasterizer: Fix issue with interpolation of opposite quaternions. (diff)
downloadyuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar.gz
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar.bz2
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar.lz
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar.xz
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.tar.zst
yuzu-aaa7beeda8be312294a32e620a172c33cb231866.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 99266854c..e7fec30cf 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -17,6 +17,7 @@
#include "video_core/rasterizer_interface.h"
#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
#include "video_core/renderer_opengl/gl_state.h"
+#include "video_core/renderer_opengl/pica_to_gl.h"
#include "video_core/shader/shader_interpreter.h"
/**
@@ -288,27 +289,27 @@ private:
};
struct LightSrc {
- std::array<GLfloat, 3> specular_0;
+ GLvec3 specular_0;
INSERT_PADDING_WORDS(1);
- std::array<GLfloat, 3> specular_1;
+ GLvec3 specular_1;
INSERT_PADDING_WORDS(1);
- std::array<GLfloat, 3> diffuse;
+ GLvec3 diffuse;
INSERT_PADDING_WORDS(1);
- std::array<GLfloat, 3> ambient;
+ GLvec3 ambient;
INSERT_PADDING_WORDS(1);
- std::array<GLfloat, 3> position;
+ GLvec3 position;
INSERT_PADDING_WORDS(1);
};
/// Uniform structure for the Uniform Buffer Object, all members must be 16-byte aligned
struct UniformData {
// A vec4 color for each of the six tev stages
- std::array<GLfloat, 4> const_color[6];
- std::array<GLfloat, 4> tev_combiner_buffer_color;
+ GLvec4 const_color[6];
+ GLvec4 tev_combiner_buffer_color;
GLint alphatest_ref;
GLfloat depth_offset;
INSERT_PADDING_WORDS(2);
- std::array<GLfloat, 3> lighting_global_ambient;
+ GLvec3 lighting_global_ambient;
INSERT_PADDING_WORDS(1);
LightSrc light_src[8];
};
@@ -434,5 +435,5 @@ private:
OGLFramebuffer framebuffer;
std::array<OGLTexture, 6> lighting_lut;
- std::array<std::array<std::array<GLfloat, 4>, 256>, 6> lighting_lut_data;
+ std::array<std::array<GLvec4, 256>, 6> lighting_lut_data;
};