From 960b54670ca3c2625eaaaee725e093b3f03251c5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 15 Aug 2014 14:09:53 -0400 Subject: OGL: Fix brace and body placements Also got rid of void argument specifiers. These are a carryover from C. --- Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp') diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index dd1ffc2dfd..fab1626554 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -75,24 +75,22 @@ void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) SetPointer(SHADER_POSITION_ATTRIB, vertex_stride, vtx_decl.position); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) SetPointer(SHADER_NORM0_ATTRIB+i, vertex_stride, vtx_decl.normals[i]); - } - for (int i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) SetPointer(SHADER_COLOR0_ATTRIB+i, vertex_stride, vtx_decl.colors[i]); - } - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) SetPointer(SHADER_TEXTURE0_ATTRIB+i, vertex_stride, vtx_decl.texcoords[i]); - } SetPointer(SHADER_POSMTX_ATTRIB, vertex_stride, vtx_decl.posmtx); vm->m_last_vao = VAO; } -void GLVertexFormat::SetupVertexPointers() { +void GLVertexFormat::SetupVertexPointers() +{ } } -- cgit v1.2.3 From 7e3d1050f0f25f659dded00a9df787195b47e7b5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 15 Aug 2014 14:16:04 -0400 Subject: OGL: Add static to a function in NativeVertexFormat --- Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp') diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index fab1626554..4207a5a4af 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -35,7 +35,7 @@ GLVertexFormat::~GLVertexFormat() glDeleteVertexArrays(1, &VAO); } -inline GLuint VarToGL(VarType t) +static inline GLuint VarToGL(VarType t) { static const GLuint lookup[5] = { GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_FLOAT -- cgit v1.2.3