Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 275 vs 279 for /trunk/Source Code/Hardware/Video/OpenGL/GLStates.cpp

Diff revisions: vs.
  @@ -10,7 +10,7 @@
10 10
11 11 GLuint GL_API::_activeVAOId = GL_INVALID_INDEX;
12 12 GLuint GL_API::_activeFBId = GL_INVALID_INDEX;
13 - GLuint GL_API::_activeBufferId[] = {GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX};
13 + GLuint GL_API::_activeBufferId[] = {GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX, GL_INVALID_INDEX};
14 14 GLuint GL_API::_activeTextureUnit = GL_INVALID_INDEX;
15 15 GLuint GL_API::_activeTransformFeedback = GL_INVALID_INDEX;
16 16
  @@ -42,6 +42,7 @@
42 42 setActiveBuffer(GL_SHADER_STORAGE_BUFFER, 0, forceAll);
43 43 setActiveBuffer(GL_ELEMENT_ARRAY_BUFFER, 0, forceAll);
44 44 setActiveBuffer(GL_PIXEL_UNPACK_BUFFER, 0, forceAll);
45 + setActiveBuffer(GL_DRAW_INDIRECT_BUFFER, 0, forceAll);
45 46 setActiveTransformFeedback(0, forceAll);
46 47 }
47 48
  @@ -150,6 +151,7 @@
150 151 case GL_SHADER_STORAGE_BUFFER : index = 3; break;
151 152 case GL_ELEMENT_ARRAY_BUFFER : index = 4; break;
152 153 case GL_PIXEL_UNPACK_BUFFER : index = 5; break;
154 + case GL_DRAW_INDIRECT_BUFFER : index = 6; break;
153 155 };
154 156
155 157 DIVIDE_ASSERT(index != -1, "GLStates error: attempted to bind an invalid buffer target!");
  @@ -186,7 +188,11 @@
186 188 }
187 189
188 190 void GL_API::changeViewport(const vec4<I32>& newViewport) const {
189 - glViewport(newViewport.x, newViewport.y, newViewport.z, newViewport.w);
191 + if (Config::Profile::USE_1x1_VIEWPORT)
192 + glViewport(newViewport.x, newViewport.y, 1, 1);
193 + else
194 + glViewport(newViewport.x, newViewport.y, newViewport.z, newViewport.w);
195 +
190 196 }
191 197
192 198 #ifndef SHOULD_TOGGLE