Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 911 vs 912 for /trunk/Source Code/Platform/Video/OpenGL/Headers/GLWrapper.h

Diff revisions: vs.
  @@ -156,6 +156,10 @@
156 156 /// Switch the current framebuffer by binding it as either a R/W buffer, read
157 157 /// buffer or write buffer
158 158 static bool setActiveFB(RenderTarget::RenderTargetUsage usage, GLuint ID);
159 + /// Set a new depth range. Default is 0 - 1 with 0 mapping to the near plane and 1 to the far plane
160 + static void setDepthRange(F32 nearVal, F32 farVal);
161 + /// Set the blending properties for the specified draw buffer
162 + static void setBlending(GLuint drawBufferIdx, bool enable, const BlendingProperties& blendingProperties, const vec4<U8>& blendColour);
159 163 /// Switch the current framebuffer by binding it as either a R/W buffer, read
160 164 /// buffer or write buffer
161 165 static bool setActiveFB(RenderTarget::RenderTargetUsage usage, GLuint ID, GLuint& previousID);
  @@ -240,7 +244,7 @@
240 244 static GLint s_maxTextureUnits;
241 245 /// Number of available attribute binding indices
242 246 static GLint s_maxAttribBindings;
243 - /// Max nubmer of texture attachmentes to an FBO
247 + /// Max number of texture attachments to an FBO
244 248 static GLint s_maxFBOAttachments;
245 249
246 250 public:
  @@ -274,8 +278,7 @@
274 278 hashAlg::pair<stringImpl, I32> _fontCache;
275 279 /// Current active vertex array object's handle
276 280 static GLuint s_activeVAOID;
277 - /// 0 - current framebuffer, 1 - current read only framebuffer, 2 - current
278 - /// write only framebuffer
281 + /// 0 - current framebuffer, 1 - current read only framebuffer, 2 - current write only framebuffer
279 282 static GLuint s_activeFBID[3];
280 283 /// VB, IB, SB, TB, UB, PUB, DIB
281 284 static GLuint s_activeBufferID[7];
  @@ -285,7 +288,11 @@
285 288 static GLint s_activePackUnpackSkipPixels[2];
286 289 static GLint s_activePackUnpackSkipRows[2];
287 290 static GLuint s_activeShaderProgram;
288 -
291 + static GLfloat s_depthNearVal;
292 + static GLfloat s_depthFarVal;
293 + static GLboolean s_blendEnabled;
294 + static vectorImpl<BlendingProperties> s_blendProperties;
295 + static vec4<U8> s_blendColour;
289 296 /// The main VAO pool. We use a pool to avoid multithreading issues with VAO states
290 297 static GLUtil::glVAOPool s_vaoPool;
291 298