#ifndef __DALI_INTERNAL_CONTEXT_H__
#define __DALI_INTERNAL_CONTEXT_H__
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// EXTERNAL INCLUDES
-#include <set>
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
-#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/actors/renderable-actor.h>
-#include <dali/integration-api/debug.h>
-#include <dali/integration-api/gl-abstraction.h>
-#include <dali/internal/render/common/performance-monitor.h>
+#include <dali/public-api/common/dali-vector.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/math/rect.h>
#include <dali/public-api/math/vector4.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/gl-abstraction.h>
+#include <dali/integration-api/gl-defines.h>
+#include <dali/internal/render/common/performance-monitor.h>
+#include <dali/internal/render/gl-resources/texture-units.h>
+#include <dali/internal/render/gl-resources/frame-buffer-state-cache.h>
+#include <dali/internal/render/gl-resources/gl-call-debug.h>
namespace Dali
{
namespace Internal
{
-class ContextObserver;
-class Program; // to be able to cache programs
-
-// wrap gl calls with CHECK_GL eg "CHECK_GL( *this, glBindTexture(textureId) );"
-// will LOG any glErrors eg "glError (0x0501) GL_INVALID_VALUE - glBindTexture(textureId)"
-// only enable if specifically enabled as it slows down GL a lot!
-#ifdef DALI_GL_ERROR_CHECK
-#define CHECK_GL(c,a) (a); (c).CheckGlError(#a)
-#else
-#define CHECK_GL(c,a) (a)
-#endif
-
-// Don't put guards around here (LOG_INFO has it's own guards)
-#define LOG_GL(format, args...) \
- DALI_LOG_INFO(Context::gGlLogFilter, Debug::General, format, ## args)
-
/**
* Context records the current GL state, and provides access to the OpenGL ES 2.0 API.
- * Observers will be notified when the GL context is created/destroyed.
* Context avoids duplicate GL calls, if the same setting etc. is requested repeatedly.
*/
class Context
public:
/**
+ * FrameBuffer Clear mode
+ */
+ enum ClearMode
+ {
+ FORCE_CLEAR, ///< always perform the glClear regardless of current state
+ CHECK_CACHED_VALUES ///< check the Frame buffers cached state to see if a clear is required
+ };
+
+ /**
* Size of the VertexAttributeArray enables
* GLES specification states that there's minimum of 8
*/
static const unsigned int MAX_ATTRIBUTE_CACHE_SIZE = 8;
+ static const unsigned int MAX_TEXTURE_UNITS = 8; // for GLES 2.0 8 is guaranteed, which is more than DALi uses anyways
+
/**
* Creates the Dali Context object.
* This method does not create an OpenGL context i.e. that is done from outside dali-core.
/**
* Called when the GL context has been created.
- * @post Context observers will be notified.
*/
void GlContextCreated();
/**
- * Called when the GL context is about to be destroyed.
- * @post Context observers will be notified, and should free any GL resources held.
+ * Called when the GL context has been destroyed.
*/
- void GlContextToBeDestroyed();
+ void GlContextDestroyed();
/**
* Query whether the OpenGL context has been created.
bool IsGlContextCreated() { return mGlContextCreated; }
/**
- * Adds an observer to the Context object.
- * The observer is responsible for calling RemoveObserver() before destruction.
- * @param[in] observer The observer to add.
- */
- void AddObserver(ContextObserver& observer);
-
- /**
- * Removes an observer from the Context object.
- * The observer must call this method before it is destroyed.
- * @param[in] observer The observer to remove.
- */
- void RemoveObserver(ContextObserver& observer);
-
- /**
* @return the GLAbstraction
*/
Integration::GlAbstraction& GetAbstraction() { return mGlAbstraction; }
-#ifdef DALI_CONTEXT_LOGGING
+#ifdef DEBUG_ENABLED
/**
* Debug helper which prints the currently cached GL state.
const char* ErrorToString( GLenum errorCode );
/**
- * Helper to check GL error during an operation
- * @param operation that was performed
- */
- void CheckGlError( const char* operation )
- {
- for( GLint error = GetError(); error; error = GetError() )
- {
- DALI_LOG_ERROR( "glError (0x%x) %s - after %s\n", error, ErrorToString(error), operation );
- DALI_ASSERT_ALWAYS( error && "GL ERROR"); // if errors are being checked we should assert
- }
- }
-
- /**
* Helper to print GL string to debug log
*/
void PrintGlString(const char* stringName, GLenum stringId)
/**
* Wrapper for OpenGL ES 2.0 glActiveTexture()
*/
- void ActiveTexture(GLenum textureUnit)
+ void ActiveTexture( TextureUnit textureUnit )
{
- // GL texture units are #defines in growing order to converting that to index
- unsigned int unit = textureUnit - GL_TEXTURE0;
-
- if ( unit != mActiveTextureUnit )
+ if ( textureUnit != mActiveTextureUnit )
{
- mActiveTextureUnit = unit;
+ mActiveTextureUnit = textureUnit;
LOG_GL("ActiveTexture %x\n", textureUnit);
- CHECK_GL( *this, mGlAbstraction.ActiveTexture(textureUnit) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ActiveTexture(TextureUnitAsGLenum(textureUnit)) );
}
}
void BeginQuery(GLenum target, GLuint id)
{
LOG_GL("BeginQuery %d %d\n", target, id);
- CHECK_GL( *this, mGlAbstraction.BeginQuery(target, id) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BeginQuery(target, id) );
}
/**
void BeginTransformFeedback(GLenum primitiveMode)
{
LOG_GL("BeginTransformFeedback %x\n", primitiveMode);
- CHECK_GL( *this, mGlAbstraction.BeginTransformFeedback(primitiveMode) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BeginTransformFeedback(primitiveMode) );
}
/**
mBoundArrayBufferId = buffer;
LOG_GL("BindBuffer GL_ARRAY_BUFFER %d\n", buffer);
- CHECK_GL( *this, mGlAbstraction.BindBuffer(GL_ARRAY_BUFFER, buffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindBuffer(GL_ARRAY_BUFFER, buffer) );
}
}
mBoundElementArrayBufferId = buffer;
LOG_GL("BindBuffer GL_ELEMENT_ARRAY_BUFFER %d\n", buffer);
- CHECK_GL( *this, mGlAbstraction.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer) );
}
}
mBoundTransformFeedbackBufferId = buffer;
LOG_GL("BindBuffer GL_TRANSFORM_FEEDBACK_BUFFER %d\n", buffer);
- CHECK_GL( *this, mGlAbstraction.BindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER , buffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER , buffer) );
}
}
mBoundTransformFeedbackBufferId = buffer;
LOG_GL("BindBufferBase GL_TRANSFORM_FEEDBACK_BUFFER %d %d\n", index, buffer);
- CHECK_GL( *this, mGlAbstraction.BindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, index, buffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, index, buffer) );
}
}
*/
void BindFramebuffer(GLenum target, GLuint framebuffer)
{
+ mFrameBufferStateCache.SetCurrentFrameBuffer( framebuffer );
+
LOG_GL("BindFramebuffer %d %d\n", target, framebuffer);
- CHECK_GL( *this, mGlAbstraction.BindFramebuffer(target, framebuffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindFramebuffer(target, framebuffer) );
}
/**
void BindRenderbuffer(GLenum target, GLuint renderbuffer)
{
LOG_GL("BindRenderbuffer %d %d\n", target, renderbuffer);
- CHECK_GL( *this, mGlAbstraction.BindRenderbuffer(target, renderbuffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindRenderbuffer(target, renderbuffer) );
}
/**
void BindTransformFeedback(GLenum target, GLuint id)
{
LOG_GL("BindTransformFeedback %d %d\n", target, id);
- CHECK_GL( *this, mGlAbstraction.BindTransformFeedback(target, id) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindTransformFeedback(target, id) );
}
/**
- * The wrapper for OpenGL ES 2.0 glBindTexture() has been replaced by Bind2dTexture and BindCubeMapTexture.
+ * Helper to bind texture for rendering. If given texture is
+ * already bound in the given textureunit, this method does nothing.
+ * Otherwise changes the active texture unit and binds the texture.
+ * Note! after this call active texture unit may not necessarily be the one
+ * passed in as argument so you cannot change texture unit state!!
+ * @param textureunit to bind to
+ * @param texture to bind
*/
+ void BindTextureForUnit( TextureUnit textureunit, GLuint texture )
+ {
+ if( mBound2dTextureId[ textureunit ] != texture )
+ {
+ ActiveTexture( textureunit );
+ Bind2dTexture( texture );
+ }
+ }
/**
* Wrapper for OpenGL ES 2.0 glBindTexture(GL_TEXTURE_2D)
mBound2dTextureId[ mActiveTextureUnit ] = texture;
LOG_GL("BindTexture GL_TEXTURE_2D %d\n", texture);
- CHECK_GL( *this, mGlAbstraction.BindTexture(GL_TEXTURE_2D, texture) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BindTexture(GL_TEXTURE_2D, texture) );
INCREASE_COUNTER(PerformanceMonitor::TEXTURE_STATE_CHANGES);
}
if( !mUsingDefaultBlendColor )
{
LOG_GL( "BlendColor %f %f %f %f\n", 0.0f, 0.0f, 0.0f, 0.0f );
- CHECK_GL( *this, mGlAbstraction.BlendColor( 0.0f, 0.0f, 0.0f, 0.0f ) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BlendColor( 0.0f, 0.0f, 0.0f, 0.0f ) );
mUsingDefaultBlendColor = true;
}
}
void SetCustomBlendColor( const Vector4& color )
{
LOG_GL( "BlendColor %f %f %f %f\n", color.r, color.g, color.b, color.a );
- CHECK_GL( *this, mGlAbstraction.BlendColor(color.r, color.g, color.b, color.a) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BlendColor(color.r, color.g, color.b, color.a) );
mUsingDefaultBlendColor = false;
}
mBlendEquationSeparateModeRGB = modeRGB;
mBlendEquationSeparateModeAlpha = modeAlpha;
LOG_GL("BlendEquationSeparate %d %d\n", modeRGB, modeAlpha);
- CHECK_GL( *this, mGlAbstraction.BlendEquationSeparate(modeRGB, modeAlpha) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BlendEquationSeparate(modeRGB, modeAlpha) );
}
}
mBlendFuncSeparateDstAlpha = dstAlpha;
LOG_GL( "BlendFuncSeparate %d %d %d %d\n", srcRGB, dstRGB, srcAlpha, dstAlpha );
- CHECK_GL( *this, mGlAbstraction.BlendFuncSeparate( srcRGB, dstRGB, srcAlpha, dstAlpha ) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BlendFuncSeparate( srcRGB, dstRGB, srcAlpha, dstAlpha ) );
}
}
*/
void BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
{
- LOG_GL( "BlitFramebuffer %d %d %d %d %d %d %d %d %x %d\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter );
- CHECK_GL( *this, mGlAbstraction.BlitFramebuffer( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ) );
+ LOG_GL( "BlitFramebuffer %d %d %d %d %d %d %d %d %x %d\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BlitFramebuffer( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ) );
}
/**
void BufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
{
LOG_GL("BufferData %d %d %p %d\n", target, size, data, usage);
- CHECK_GL( *this, mGlAbstraction.BufferData(target, size, data, usage) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BufferData(target, size, data, usage) );
}
/**
void BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void* data)
{
LOG_GL("BufferSubData %d %d %d %p\n", target, offset, size, data);
- CHECK_GL( *this, mGlAbstraction.BufferSubData(target, offset, size, data) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.BufferSubData(target, offset, size, data) );
}
/**
GLenum CheckFramebufferStatus(GLenum target)
{
LOG_GL("CheckFramebufferStatus %d\n", target);
- GLenum value = CHECK_GL( *this, mGlAbstraction.CheckFramebufferStatus(target) );
+ GLenum value = CHECK_GL( mGlAbstraction, mGlAbstraction.CheckFramebufferStatus(target) );
return value;
}
/**
* Wrapper for OpenGL ES 2.0 glClear()
*/
- void Clear(GLbitfield mask)
+ void Clear(GLbitfield mask, ClearMode mode )
{
- LOG_GL("Clear %d\n", mask);
- CHECK_GL( *this, mGlAbstraction.Clear(mask) );
+ bool forceClear = (mode == FORCE_CLEAR );
+ mask = mFrameBufferStateCache.GetClearMask( mask, forceClear , mScissorTestEnabled );
+
+ if( mask > 0 )
+ {
+ LOG_GL("Clear %d\n", mask);
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Clear( mask ) );
+ }
}
/**
if (!mClearColorSet || mClearColor !=newCol )
{
LOG_GL("ClearColor %f %f %f %f\n", red, green, blue, alpha);
- CHECK_GL( *this, mGlAbstraction.ClearColor(red, green, blue, alpha) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ClearColor(red, green, blue, alpha) );
mClearColorSet = true;
mClearColor = newCol;
void ClearDepthf(GLclampf depth)
{
LOG_GL("ClearDepthf %f\n", depth);
- CHECK_GL( *this, mGlAbstraction.ClearDepthf(depth) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ClearDepthf(depth) );
}
/**
void ClearStencil(GLint s)
{
LOG_GL("ClearStencil %d\n", s);
- CHECK_GL( *this, mGlAbstraction.ClearStencil(s) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ClearStencil(s) );
}
/**
{
mColorMask = flag;
LOG_GL("ColorMask %s %s %s %s\n", flag ? "True" : "False", flag ? "True" : "False", flag ? "True" : "False", flag ? "True" : "False");
- CHECK_GL( *this, mGlAbstraction.ColorMask(flag, flag, flag, flag) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ColorMask(flag, flag, flag, flag) );
}
}
GLint border, GLsizei imageSize, const void* data)
{
LOG_GL("CompressedTexImage2D %d %d %x %d %d %d %d %p\n", target, level, internalformat, width, height, border, imageSize, data);
- CHECK_GL( *this, mGlAbstraction.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data) );
}
/**
GLint border, GLsizei imageSize, const void* data)
{
LOG_GL("CompressedTexImage3D %d %d %x %d %d %d %d %d %p\n", target, level, internalformat, width, height, depth, border, imageSize, data);
- CHECK_GL( *this, mGlAbstraction.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data) );
}
/**
GLenum format, GLsizei imageSize, const void* data)
{
LOG_GL("CompressedTexSubImage2D %x %d %d %d %d %d %x %d %p\n", target, level, xoffset, yoffset, width, height, format, imageSize, data);
- CHECK_GL( *this, mGlAbstraction.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data) );
}
/**
GLenum format, GLsizei imageSize, const void* data)
{
LOG_GL("CompressedTexSubImage3D %x %d %d %d %d %d %d %d %x %d %p\n", target, level, xoffset, yoffset, xoffset, width, height, depth, format, imageSize, data);
- CHECK_GL( *this, mGlAbstraction.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data) );
}
/**
void CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
{
LOG_GL("CopyTexImage2D %x %d %x %d %d %d %d %d\n", target, level, internalformat, x, y, width, height, border);
- CHECK_GL( *this, mGlAbstraction.CopyTexImage2D(target, level, internalformat, x, y, width, height, border) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CopyTexImage2D(target, level, internalformat, x, y, width, height, border) );
}
/**
void CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
{
LOG_GL("CopyTexSubImage2D %x %d %d %d %d %d %d %d\n", target, level, xoffset, yoffset, x, y, width, height);
- CHECK_GL( *this, mGlAbstraction.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height) );
}
/**
void CopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
{
LOG_GL("CopyTexSubImage3D %x %d %d %d %d %d %d %d %d\n", target, level, xoffset, yoffset, zoffset, x, y, width, height);
- CHECK_GL( *this, mGlAbstraction.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height) );
}
/**
case CullNone:
{
LOG_GL("Disable GL_CULL_FACE\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_CULL_FACE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_CULL_FACE) );
break;
}
case CullFront:
{
LOG_GL("Enable GL_CULL_FACE\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_CULL_FACE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_CULL_FACE) );
LOG_GL("Enable GL_FRONT\n");
- CHECK_GL( *this, mGlAbstraction.CullFace(GL_FRONT) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CullFace(GL_FRONT) );
break;
}
case CullBack:
{
LOG_GL("Enable GL_CULL_FACE\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_CULL_FACE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_CULL_FACE) );
LOG_GL("Enable GL_BACK\n");
- CHECK_GL( *this, mGlAbstraction.CullFace(GL_BACK) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CullFace(GL_BACK) );
break;
}
case CullFrontAndBack:
{
LOG_GL("Enable GL_CULL_FACE\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_CULL_FACE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_CULL_FACE) );
LOG_GL("Enable GL_FRONT_AND_BACK\n");
- CHECK_GL( *this, mGlAbstraction.CullFace(GL_FRONT_AND_BACK) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.CullFace(GL_FRONT_AND_BACK) );
break;
}
*/
void DeleteBuffers(GLsizei n, const GLuint* buffers)
{
- LOG_GL("DeleteBuffers %d %p\n", n, buffers);
- CHECK_GL( *this, mGlAbstraction.DeleteBuffers(n, buffers) );
-
+ // @todo: this is to prevent mesh destructor from doing GL calls when DALi core is being deleted
+ // can be taken out once render manages either knows about meshes or gpubuffers and can tell them directly that context is lost
+ if( this->IsGlContextCreated() )
+ {
+ LOG_GL("DeleteBuffers %d %p\n", n, buffers);
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteBuffers(n, buffers) );
+ }
// reset the cached buffer id's
// fixes problem where some drivers will a generate a buffer with the
// same id, as the last deleted buffer id.
*/
void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
{
+ mFrameBufferStateCache.FrameBuffersDeleted( n, framebuffers );
+
LOG_GL("DeleteFramebuffers %d %p\n", n, framebuffers);
- CHECK_GL( *this, mGlAbstraction.DeleteFramebuffers(n, framebuffers) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteFramebuffers(n, framebuffers) );
}
/**
void DeleteQueries(GLsizei n, GLuint* ids)
{
LOG_GL("DeleteQueries %d %p\n", n, ids);
- CHECK_GL( *this, mGlAbstraction.DeleteQueries(n, ids) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteQueries(n, ids) );
}
/**
void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
{
LOG_GL("DeleteRenderbuffers %d %p\n", n, renderbuffers);
- CHECK_GL( *this, mGlAbstraction.DeleteRenderbuffers(n, renderbuffers) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteRenderbuffers(n, renderbuffers) );
}
/**
void DeleteTextures(GLsizei n, const GLuint* textures)
{
LOG_GL("DeleteTextures %d %p\n", n, textures);
- CHECK_GL( *this, mGlAbstraction.DeleteTextures(n, textures) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteTextures(n, textures) );
// reset the cached texture id's incase the driver re-uses them
// when creating new textures
- for( int i=0; i < mMaxTextureUnits; ++i )
+ for( unsigned int i=0; i < MAX_TEXTURE_UNITS; ++i )
{
mBound2dTextureId[ i ] = 0;
}
void DeleteTransformFeedbacks(GLsizei n, GLuint* ids)
{
LOG_GL("DeleteTransformFeedbacks %d %p\n", n, ids);
- CHECK_GL( *this, mGlAbstraction.DeleteTransformFeedbacks(n, ids) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DeleteTransformFeedbacks(n, ids) );
}
/**
void DepthFunc(GLenum func)
{
LOG_GL("DepthFunc %x\n", func);
- CHECK_GL( *this, mGlAbstraction.DepthFunc(func) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DepthFunc(func) );
}
/**
{
mDepthMaskEnabled = flag;
LOG_GL("DepthMask %s\n", flag ? "True" : "False");
- CHECK_GL( *this, mGlAbstraction.DepthMask( mDepthMaskEnabled ) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DepthMask( mDepthMaskEnabled ) );
}
}
void DepthRangef(GLclampf zNear, GLclampf zFar)
{
LOG_GL("DepthRangef %f %f\n", zNear, zFar);
- CHECK_GL( *this, mGlAbstraction.DepthRangef(zNear, zFar) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DepthRangef(zNear, zFar) );
}
/**
*/
void DrawArrays(GLenum mode, GLint first, GLsizei count)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
FlushVertexAttributeLocations();
LOG_GL("DrawArrays %x %d %d\n", mode, first, count);
- CHECK_GL( *this, mGlAbstraction.DrawArrays(mode, first, count) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawArrays(mode, first, count) );
}
/**
*/
void DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
FlushVertexAttributeLocations();
LOG_GL("DrawArraysInstanced %x %d %d %d\n", mode, first, count, instanceCount);
- CHECK_GL( *this, mGlAbstraction.DrawArraysInstanced(mode, first, count,instanceCount) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawArraysInstanced(mode, first, count,instanceCount) );
}
/**
*/
void DrawBuffers(GLsizei n, const GLenum* bufs)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
LOG_GL("DrawBuffers %d %p\n", n, bufs);
- CHECK_GL( *this, mGlAbstraction.DrawBuffers(n, bufs) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawBuffers(n, bufs) );
}
/**
*/
void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
+
FlushVertexAttributeLocations();
LOG_GL("DrawElements %x %d %d %p\n", mode, count, type, indices);
- CHECK_GL( *this, mGlAbstraction.DrawElements(mode, count, type, indices) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawElements(mode, count, type, indices) );
}
/**
*/
void DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei instanceCount)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
+
FlushVertexAttributeLocations();
LOG_GL("DrawElementsInstanced %x %d %d %p %d\n", mode, count, type, indices, instanceCount);
- CHECK_GL( *this, mGlAbstraction.DrawElementsInstanced(mode, count, type, indices, instanceCount) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawElementsInstanced(mode, count, type, indices, instanceCount) );
}
/**
*/
void DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void* indices)
{
+ mFrameBufferStateCache.DrawOperation( mColorMask, DepthBufferWriteEnabled(), StencilBufferWriteEnabled() );
FlushVertexAttributeLocations();
LOG_GL("DrawRangeElements %x %u %u %d %d %p\n", mode, start, end, count, type, indices);
- CHECK_GL( *this, mGlAbstraction.DrawRangeElements(mode, start, end, count, type, indices) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.DrawRangeElements(mode, start, end, count, type, indices) );
}
/**
void GenQueries(GLsizei n, GLuint* ids)
{
LOG_GL("GenQueries %d %p\n", n, ids);
- CHECK_GL( *this, mGlAbstraction.GenQueries(n, ids) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenQueries(n, ids) );
}
/**
void GenTransformFeedbacks(GLsizei n, GLuint* ids)
{
LOG_GL("GenTransformFeedbacks %d %p\n", n, ids);
- CHECK_GL( *this, mGlAbstraction.GenTransformFeedbacks(n, ids) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenTransformFeedbacks(n, ids) );
}
/**
*/
void VertexAttribDivisor ( GLuint index, GLuint divisor )
{
- LOG_GL("VertexAttribPointer(%d, %d)\n", index, divisor );
- CHECK_GL( *this, mGlAbstraction.VertexAttribDivisor( index, divisor ) );
+ LOG_GL("VertexAttribDivisor(%d, %d)\n", index, divisor );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.VertexAttribDivisor( index, divisor ) );
}
/**
void VertexAttribPointer( GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr )
{
LOG_GL("VertexAttribPointer(%d, %d, %d, %d, %d, %x)\n", index, size, type, normalized, stride, ptr );
- CHECK_GL( *this, mGlAbstraction.VertexAttribPointer( index, size, type, normalized, stride, ptr ) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.VertexAttribPointer( index, size, type, normalized, stride, ptr ) );
}
/**
void InvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
{
LOG_GL("InvalidateFramebuffer\n");
- CHECK_GL( *this, mGlAbstraction.InvalidateFramebuffer(target, numAttachments, attachments) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.InvalidateFramebuffer(target, numAttachments, attachments) );
}
/**
if (enable)
{
LOG_GL("Enable GL_BLEND\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_BLEND) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_BLEND) );
}
else
{
LOG_GL("Disable GL_BLEND\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_BLEND) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_BLEND) );
}
}
}
/**
* This method replaces glEnable(GL_DEPTH_TEST) and glDisable(GL_DEPTH_TEST).
+ * Note GL_DEPTH_TEST means enable the depth buffer for writing and or testing.
+ * glDepthMask is used to enable / disable writing to depth buffer.
+ * glDepthFunc us used to control if testing is enabled and how it is performed ( default GL_LESS)
+ *
* @param[in] enable True if GL_DEPTH_TEST should be enabled.
*/
- void SetDepthTest(bool enable)
+ void EnableDepthBuffer( bool enable )
{
// Avoid unecessary calls to glEnable/glDisable
- if (enable != mDepthTestEnabled)
+ if( enable != mDepthBufferEnabled )
{
- mDepthTestEnabled = enable;
+ mDepthBufferEnabled = enable;
if (enable)
{
LOG_GL("Enable GL_DEPTH_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_DEPTH_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_DEPTH_TEST) );
}
else
{
LOG_GL("Disable GL_DEPTH_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_DEPTH_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_DEPTH_TEST) );
}
}
}
if (enable)
{
LOG_GL("Enable GL_DITHER\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_DITHER) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_DITHER) );
}
else
{
LOG_GL("Disable GL_DITHER\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_DITHER) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_DITHER) );
}
}
}
if (enable)
{
LOG_GL("Enable GL_POLYGON_OFFSET_FILL\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_POLYGON_OFFSET_FILL) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_POLYGON_OFFSET_FILL) );
}
else
{
LOG_GL("Disable GL_POLYGON_OFFSET_FILL\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_POLYGON_OFFSET_FILL) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_POLYGON_OFFSET_FILL) );
}
}
}
if (enable)
{
LOG_GL("Enable GL_SAMPLE_ALPHA_TO_COVERAGE\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_SAMPLE_ALPHA_TO_COVERAGE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_SAMPLE_ALPHA_TO_COVERAGE) );
}
else
{
LOG_GL("Disable GL_SAMPLE_ALPHA_TO_COVERAGE\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_SAMPLE_ALPHA_TO_COVERAGE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_SAMPLE_ALPHA_TO_COVERAGE) );
}
}
}
if (enable)
{
LOG_GL("Enable GL_SAMPLE_COVERAGE\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_SAMPLE_COVERAGE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_SAMPLE_COVERAGE) );
}
else
{
LOG_GL("Disable GL_SAMPLE_COVERAGE\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_SAMPLE_COVERAGE) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_SAMPLE_COVERAGE) );
}
}
}
if (enable)
{
LOG_GL("Enable GL_SCISSOR_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_SCISSOR_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_SCISSOR_TEST) );
}
else
{
LOG_GL("Disable GL_SCISSOR_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_SCISSOR_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_SCISSOR_TEST) );
}
}
}
/**
* This method replaces glEnable(GL_STENCIL_TEST) and glDisable(GL_STENCIL_TEST).
+ * Note GL_STENCIL_TEST means enable the stencil buffer for writing and or testing.
+ * glStencilMask is used to control how bits are written to the stencil buffer.
+ * glStencilFunc is used to control if testing is enabled and how it is performed ( default GL_ALWAYS )
* @param[in] enable True if GL_STENCIL_TEST should be enabled.
*/
- void SetStencilTest(bool enable)
+ void EnableStencilBuffer(bool enable)
{
// Avoid unecessary calls to glEnable/glDisable
- if (enable != mStencilTestEnabled)
+ if( enable != mStencilBufferEnabled )
{
- mStencilTestEnabled = enable;
+ mStencilBufferEnabled = enable;
if (enable)
{
LOG_GL("Enable GL_STENCIL_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Enable(GL_STENCIL_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Enable(GL_STENCIL_TEST) );
}
else
{
LOG_GL("Disable GL_STENCIL_TEST\n");
- CHECK_GL( *this, mGlAbstraction.Disable(GL_STENCIL_TEST) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Disable(GL_STENCIL_TEST) );
}
}
}
void EndQuery(GLenum target)
{
LOG_GL("EndQuery %d\n", target);
- CHECK_GL( *this, mGlAbstraction.EndQuery(target) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.EndQuery(target) );
}
/**
void EndTransformFeedback()
{
LOG_GL("EndTransformFeedback\n");
- CHECK_GL( *this, mGlAbstraction.EndTransformFeedback() );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.EndTransformFeedback() );
}
/**
void Finish(void)
{
LOG_GL("Finish\n");
- CHECK_GL( *this, mGlAbstraction.Finish() );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Finish() );
}
/**
void Flush(void)
{
LOG_GL("Flush\n");
- CHECK_GL( *this, mGlAbstraction.Flush() );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Flush() );
}
/**
void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
{
LOG_GL("FramebufferRenderbuffer %x %x %x %d\n", target, attachment, renderbuffertarget, renderbuffer);
- CHECK_GL( *this, mGlAbstraction.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer) );
}
/**
void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
{
LOG_GL("FramebufferTexture2D %x %x %x %d %d\n", target, attachment, textarget, texture, level);
- CHECK_GL( *this, mGlAbstraction.FramebufferTexture2D(target, attachment, textarget, texture, level) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.FramebufferTexture2D(target, attachment, textarget, texture, level) );
}
/**
void FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
{
LOG_GL("FramebufferTextureLayer %x %x %d %d %d\n", target, attachment, texture, level, layer);
- CHECK_GL( *this, mGlAbstraction.FramebufferTextureLayer(target, attachment, texture, level, layer) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.FramebufferTextureLayer(target, attachment, texture, level, layer) );
}
/**
void FrontFace(GLenum mode)
{
LOG_GL("FrontFace %x\n", mode);
- CHECK_GL( *this, mGlAbstraction.FrontFace(mode) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.FrontFace(mode) );
}
/**
void GenBuffers(GLsizei n, GLuint* buffers)
{
LOG_GL("GenBuffers %d\n", n, buffers);
- CHECK_GL( *this, mGlAbstraction.GenBuffers(n, buffers) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenBuffers(n, buffers) );
}
/**
void GenerateMipmap(GLenum target)
{
LOG_GL("GenerateMipmap %x\n", target);
- CHECK_GL( *this, mGlAbstraction.GenerateMipmap(target) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenerateMipmap(target) );
}
/**
void GenFramebuffers(GLsizei n, GLuint* framebuffers)
{
LOG_GL("GenFramebuffers %d %p\n", n, framebuffers);
- CHECK_GL( *this, mGlAbstraction.GenFramebuffers(n, framebuffers) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenFramebuffers(n, framebuffers) );
+
+ mFrameBufferStateCache.FrameBuffersCreated( n, framebuffers );
}
/**
void GenRenderbuffers(GLsizei n, GLuint* renderbuffers)
{
LOG_GL("GenRenderbuffers %d %p\n", n, renderbuffers);
- CHECK_GL( *this, mGlAbstraction.GenRenderbuffers(n, renderbuffers) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenRenderbuffers(n, renderbuffers) );
}
/**
void GenTextures(GLsizei n, GLuint* textures)
{
LOG_GL("GenTextures %d %p\n", n, textures);
- CHECK_GL( *this, mGlAbstraction.GenTextures(n, textures) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GenTextures(n, textures) );
}
/**
void GetBooleanv(GLenum pname, GLboolean* params)
{
LOG_GL("GetBooleanv %x\n", pname);
- CHECK_GL( *this, mGlAbstraction.GetBooleanv(pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetBooleanv(pname, params) );
}
/**
void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
{
LOG_GL("GetBufferParameteriv %x %x %p\n", target, pname, params);
- CHECK_GL( *this, mGlAbstraction.GetBufferParameteriv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetBufferParameteriv(target, pname, params) );
}
/**
void GetBufferPointerv(GLenum target, GLenum pname, GLvoid** params)
{
LOG_GL("GetBufferPointerv %x %x %p\n", target, pname, params);
- CHECK_GL( *this, mGlAbstraction.GetBufferPointerv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetBufferPointerv(target, pname, params) );
}
/**
void GetFloatv(GLenum pname, GLfloat* params)
{
LOG_GL("GetFloatv %x\n", pname);
- CHECK_GL( *this, mGlAbstraction.GetFloatv(pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetFloatv(pname, params) );
}
/**
void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
{
LOG_GL("GetFramebufferAttachmentParameteriv %x %x %x\n", target, attachment, pname);
- CHECK_GL( *this, mGlAbstraction.GetFramebufferAttachmentParameteriv(target, attachment, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetFramebufferAttachmentParameteriv(target, attachment, pname, params) );
}
/**
void GetIntegerv(GLenum pname, GLint* params)
{
LOG_GL("GetIntegerv %x\n", pname);
- CHECK_GL( *this, mGlAbstraction.GetIntegerv(pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetIntegerv(pname, params) );
}
/**
void GetQueryiv(GLenum target, GLenum pname, GLint* params)
{
LOG_GL("GetQueryiv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.GetQueryiv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetQueryiv(target, pname, params) );
}
/**
void GetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
{
LOG_GL("GetQueryObjectuiv %u %x %p\n", id, pname, params);
- CHECK_GL( *this, mGlAbstraction.GetQueryObjectuiv(id, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetQueryObjectuiv(id, pname, params) );
}
/**
void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
{
LOG_GL("GetRenderbufferParameteriv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.GetRenderbufferParameteriv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetRenderbufferParameteriv(target, pname, params) );
}
/**
const GLubyte* GetString(GLenum name)
{
LOG_GL("GetString %x\n", name);
- const GLubyte* str = CHECK_GL( *this, mGlAbstraction.GetString(name) );
+ const GLubyte* str = CHECK_GL( mGlAbstraction, mGlAbstraction.GetString(name) );
return str;
}
void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
{
LOG_GL("GetTexParameterfv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.GetTexParameterfv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetTexParameterfv(target, pname, params) );
}
/**
void GetTexParameteriv(GLenum target, GLenum pname, GLint* params)
{
LOG_GL("GetTexParameteriv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.GetTexParameteriv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.GetTexParameteriv(target, pname, params) );
}
/**
void Hint(GLenum target, GLenum mode)
{
LOG_GL("Hint %x %x\n", target, mode);
- CHECK_GL( *this, mGlAbstraction.Hint(target, mode) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Hint(target, mode) );
}
/**
GLboolean IsBuffer(GLuint buffer)
{
LOG_GL("IsBuffer %d\n", buffer);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsBuffer(buffer) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsBuffer(buffer) );
return val;
}
GLboolean IsEnabled(GLenum cap)
{
LOG_GL("IsEnabled %x\n", cap);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsEnabled(cap) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsEnabled(cap) );
return val;
}
GLboolean IsFramebuffer(GLuint framebuffer)
{
LOG_GL("IsFramebuffer %d\n", framebuffer);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsFramebuffer(framebuffer) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsFramebuffer(framebuffer) );
return val;
}
GLboolean IsQuery(GLuint id)
{
LOG_GL("IsQuery %u\n", id);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsQuery(id) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsQuery(id) );
return val;
}
GLboolean IsRenderbuffer(GLuint renderbuffer)
{
LOG_GL("IsRenderbuffer %d\n", renderbuffer);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsRenderbuffer(renderbuffer) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsRenderbuffer(renderbuffer) );
return val;
}
GLboolean IsTexture(GLuint texture)
{
LOG_GL("IsTexture %d\n", texture);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsTexture(texture) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsTexture(texture) );
return val;
}
GLboolean IsTransformFeedback(GLuint id)
{
LOG_GL("IsTransformFeedback %u\n", id);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.IsTransformFeedback(id) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.IsTransformFeedback(id) );
return val;
}
void LineWidth(GLfloat width)
{
LOG_GL("LineWidth %f\n", width);
- CHECK_GL( *this, mGlAbstraction.LineWidth(width) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.LineWidth(width) );
}
/**
void PauseTransformFeedback()
{
LOG_GL("PauseTransformFeedback\n");
- CHECK_GL( *this, mGlAbstraction.PauseTransformFeedback() );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.PauseTransformFeedback() );
}
/**
void PixelStorei(GLenum pname, GLint param)
{
LOG_GL("PixelStorei %x %d\n", pname, param);
- CHECK_GL( *this, mGlAbstraction.PixelStorei(pname, param) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.PixelStorei(pname, param) );
}
/**
void PolygonOffset(GLfloat factor, GLfloat units)
{
LOG_GL("PolygonOffset %f %f\n", factor, units);
- CHECK_GL( *this, mGlAbstraction.PolygonOffset(factor, units) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.PolygonOffset(factor, units) );
}
/**
void ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels)
{
LOG_GL("ReadPixels %d %d %d %d %x %x\n", x, y, width, height, format, type);
- CHECK_GL( *this, mGlAbstraction.ReadPixels(x, y, width, height, format, type, pixels) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ReadPixels(x, y, width, height, format, type, pixels) );
}
/**
void RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
{
LOG_GL("RenderbufferStorage %x %x %d %d\n", target, internalformat, width, height);
- CHECK_GL( *this, mGlAbstraction.RenderbufferStorage(target, internalformat, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.RenderbufferStorage(target, internalformat, width, height) );
}
/**
void RenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
{
LOG_GL("RenderbufferStorageMultisample %x %u %x %d %d\n", target, samples, internalformat, width, height);
- CHECK_GL( *this, mGlAbstraction.RenderbufferStorageMultisample(target, samples, internalformat, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.RenderbufferStorageMultisample(target, samples, internalformat, width, height) );
}
/**
void ResumeTransformFeedback()
{
LOG_GL("ResumeTransformFeedback\n");
- CHECK_GL( *this, mGlAbstraction.ResumeTransformFeedback() );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.ResumeTransformFeedback() );
}
/**
void SampleCoverage(GLclampf value, GLboolean invert)
{
LOG_GL("SampleCoverage %f %s\n", value, invert ? "True" : "False");
- CHECK_GL( *this, mGlAbstraction.SampleCoverage(value, invert) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.SampleCoverage(value, invert) );
}
/**
void Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
{
LOG_GL("Scissor %d %d %d %d\n", x, y, width, height);
- CHECK_GL( *this, mGlAbstraction.Scissor(x, y, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Scissor(x, y, width, height) );
}
/**
*/
void StencilFunc(GLenum func, GLint ref, GLuint mask)
{
+
+
LOG_GL("StencilFunc %x %d %d\n", func, ref, mask);
- CHECK_GL( *this, mGlAbstraction.StencilFunc(func, ref, mask) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilFunc(func, ref, mask) );
}
/**
void StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
{
LOG_GL("StencilFuncSeparate %x %x %d %d\n", face, func, ref, mask);
- CHECK_GL( *this, mGlAbstraction.StencilFuncSeparate(face, func, ref, mask) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilFuncSeparate(face, func, ref, mask) );
}
/**
mStencilMask = mask;
LOG_GL("StencilMask %d\n", mask);
- CHECK_GL( *this, mGlAbstraction.StencilMask(mask) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilMask(mask) );
}
}
void StencilMaskSeparate(GLenum face, GLuint mask)
{
LOG_GL("StencilMaskSeparate %x %d\n", face, mask);
- CHECK_GL( *this, mGlAbstraction.StencilMaskSeparate(face, mask) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilMaskSeparate(face, mask) );
}
/**
void StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
{
LOG_GL("StencilOp %x %x %x\n", fail, zfail, zpass);
- CHECK_GL( *this, mGlAbstraction.StencilOp(fail, zfail, zpass) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilOp(fail, zfail, zpass) );
}
/**
void StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
{
LOG_GL("StencilOpSeparate %x %x %x %x\n", face, fail, zfail, zpass);
- CHECK_GL( *this, mGlAbstraction.StencilOpSeparate(face, fail, zfail, zpass) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.StencilOpSeparate(face, fail, zfail, zpass) );
}
/**
GLint border, GLenum format, GLenum type, const void* pixels)
{
LOG_GL("TexImage2D %x %d %d %dx%d %d %x %x %p\n", target, level, internalformat, width, height, border, format, type, pixels);
- CHECK_GL( *this, mGlAbstraction.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels) );
}
/**
GLint border, GLenum format, GLenum type, const void* pixels)
{
LOG_GL("TexImage3D %x %d %d %dx%dx%d %d %x %x %p\n", target, level, internalformat, width, height, depth, border, format, type, pixels);
- CHECK_GL( *this, mGlAbstraction.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels) );
}
/**
void TexParameterf(GLenum target, GLenum pname, GLfloat param)
{
LOG_GL("TexParameterf %x %x %f\n", target, pname, param);
- CHECK_GL( *this, mGlAbstraction.TexParameterf(target, pname, param) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexParameterf(target, pname, param) );
}
/**
void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
{
LOG_GL("TexParameterfv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.TexParameterfv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexParameterfv(target, pname, params) );
}
/**
void TexParameteri(GLenum target, GLenum pname, GLint param)
{
LOG_GL("TexParameteri %x %x %d\n", target, pname, param);
- CHECK_GL( *this, mGlAbstraction.TexParameteri(target, pname, param) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexParameteri(target, pname, param) );
}
/**
void TexParameteriv(GLenum target, GLenum pname, const GLint* params)
{
LOG_GL("TexParameteriv %x %x\n", target, pname);
- CHECK_GL( *this, mGlAbstraction.TexParameteriv(target, pname, params) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexParameteriv(target, pname, params) );
}
/**
GLenum format, GLenum type, const void* pixels)
{
LOG_GL("TexSubImage2D %x %d %d %d %d %d %x %x %p\n", target, level, xoffset, yoffset, width, height, format, type, pixels);
- CHECK_GL( *this, mGlAbstraction.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels) );
}
/**
GLenum format, GLenum type, const void* pixels)
{
LOG_GL("TexSubImage3D %x %d %d %d %d %d %d %d %x %x %p\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
- CHECK_GL( *this, mGlAbstraction.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels) );
}
/**
GLboolean UnmapBuffer(GLenum target)
{
LOG_GL("UnmapBuffer %x \n", target);
- GLboolean val = CHECK_GL( *this, mGlAbstraction.UnmapBuffer(target) );
+ GLboolean val = CHECK_GL( mGlAbstraction, mGlAbstraction.UnmapBuffer(target) );
return val;
}
/**
{
// set new one
LOG_GL("Viewport %d %d %d %d\n", x, y, width, height);
- CHECK_GL( *this, mGlAbstraction.Viewport(x, y, width, height) );
+ CHECK_GL( mGlAbstraction, mGlAbstraction.Viewport(x, y, width, height) );
mViewPort = newViewport; // remember new one
}
}
}
/**
- * Get the number of supported program binary formats
- * @return The number of supported program binary formats
+ * Get the current viewport.
+ * @return Viewport rectangle.
*/
- GLint CachedNumberOfProgramBinaryFormats() const
+ const Rect< int >& GetViewport();
+
+ /**
+ * Set the frame count of render thread
+ */
+ inline void SetFrameCount(unsigned int frameCount)
{
- return mProgramBinaryFormats.size();
+ mFrameCount = frameCount;
}
/**
- * Get a supported program binary format
- * @param[in] formatIndex The index of the format to return (default: 0)
- * @return A supported program binary format
+ * Get the frame count
*/
- GLint CachedProgramBinaryFormat( const unsigned int formatIndex = 0 ) const
+ inline unsigned int GetFrameCount()
{
- DALI_ASSERT_ALWAYS( formatIndex < mProgramBinaryFormats.size() && "formatIndex out of bounds");
-
- return mProgramBinaryFormats[ formatIndex ];
+ return mFrameCount;
}
/**
- * @return current program
+ * Increment the count of culled renderers
*/
- const Program* GetCurrentProgram() const
+ inline void IncrementCulledCount()
{
- return mCurrentProgram;
+ mCulledCount++;
}
/**
- * Set current program
- * @param [in] program that is in use
+ * Clear the count of culled renderers
*/
- void SetCurrentProgram( Program* program )
+ inline void ClearCulledCount()
{
- mCurrentProgram = program;
+ mCulledCount = 0;
}
/**
- * Get a cached program
- * @param [in] hash value
- * @return pointer to the program
+ * Get the count of culled renderers in this frame
*/
- Program* GetCachedProgram( std::size_t hash ) const;
+ inline unsigned int GetCulledCount()
+ {
+ return mCulledCount;
+ }
/**
- * Cache a program
- * @param [in] hash value
- * @param [in] pointer to the program
+ * Increment the count of culled renderers
*/
- void CacheProgram( std::size_t hash, Program* pointer );
+ inline void IncrementRendererCount()
+ {
+ mRendererCount++;
+ }
/**
- * Get the current viewport.
- * @return Viewport rectangle.
+ * Clear the count of image renderers
*/
- const Rect< int >& GetViewport();
+ inline void ClearRendererCount()
+ {
+ mRendererCount = 0;
+ }
-#ifdef DEBUG_ENABLED
+ /**
+ * Get the count of image renderers in this frame
+ */
+ inline unsigned int GetRendererCount()
+ {
+ return mRendererCount;
+ }
- /// Switch debug level to Concise to disable, General to enable. Note, enabling snapshot logging will do this on the fly.
- static Debug::Filter *gGlLogFilter;
+private: // Implementation
-#endif // DEBUG_ENABLED
+ /**
+ * @return true if next draw operation will write to depth buffer
+ */
+ bool DepthBufferWriteEnabled() const
+ {
+ return mDepthBufferEnabled && mDepthMaskEnabled;
+ }
-private: // Implementation
+ /**
+ * @return true if next draw operation will write to stencil buffer
+ */
+ bool StencilBufferWriteEnabled() const
+ {
+ return mStencilBufferEnabled && ( mStencilMask > 0 );
+ }
/**
* Flushes vertex attribute location changes to the driver
bool mColorMask;
GLuint mStencilMask;
bool mBlendEnabled;
- bool mDepthTestEnabled;
+ bool mDepthBufferEnabled;
bool mDepthMaskEnabled;
bool mDitherEnabled;
bool mPolygonOffsetFillEnabled;
bool mSampleAlphaToCoverageEnabled;
bool mSampleCoverageEnabled;
bool mScissorTestEnabled;
- bool mStencilTestEnabled;
+ bool mStencilBufferEnabled;
bool mClearColorSet;
// glBindBuffer() state
GLuint mBoundTransformFeedbackBufferId; ///< The ID passed to glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER)
// glBindTexture() state
- unsigned int mActiveTextureUnit;
- std::vector<GLuint> mBound2dTextureId; ///< The ID passed to glBindTexture(GL_TEXTURE_2D)
+ TextureUnit mActiveTextureUnit;
+ GLuint mBound2dTextureId[ MAX_TEXTURE_UNITS ]; ///< The ID passed to glBindTexture(GL_TEXTURE_2D)
// glBlendColor() state
bool mUsingDefaultBlendColor;
GLenum mBlendEquationSeparateModeAlpha; ///< Controls Alpha blend mode
GLint mMaxTextureSize; ///< return value from GetIntegerv(GL_MAX_TEXTURE_SIZE)
- GLint mMaxTextureUnits; ///< return value from GetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS)
Vector4 mClearColor; ///< clear color
- std::vector<GLint> mProgramBinaryFormats; ///< array of supported program binary formats
-
// Face culling mode
CullFaceMode mCullFaceMode;
bool mVertexAttributeCachedState[ MAX_ATTRIBUTE_CACHE_SIZE ]; ///< Value cache for Enable Vertex Attribute
bool mVertexAttributeCurrentState[ MAX_ATTRIBUTE_CACHE_SIZE ]; ///< Current state on the driver for Enable Vertex Attribute
- std::set<ContextObserver*> mObservers;
-
- Program* mCurrentProgram;
- std::map< std::size_t, Program* > mProgramCache; /// program cache
-
+ unsigned int mFrameCount; ///< Number of render frames
+ unsigned int mCulledCount; ///< Number of culled renderers per frame
+ unsigned int mRendererCount; ///< Number of image renderers per frame
+ FrameBufferStateCache mFrameBufferStateCache; ///< frame buffer state cache
};
} // namespace Internal
projects / platform / core / uifw / dali-core.git / blobdiff