Skip to content

S
swiftshader
Commit 4df0c65b by Nicolas Capens
Options

Use namespaces for context owned objects.

Bug 19219444 Change-Id: I9606dfb30693a15a06896d83888022ccbaa8db2e Reviewed-on: https://swiftshader-review.googlesource.com/5010Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 433ae74c
Showing with 162 additions and 362 deletions
src/OpenGL/common/NameSpace.hpp
......@@ -46,7 +46,7 @@ public:
return map.begin()->first;
}
GLuint allocate()
GLuint allocate(ObjectType *object = nullptr)
{
GLuint name = freeName;
......@@ -55,13 +55,13 @@ public:
name++;
}
map.insert({name, nullptr});
map.insert({name, object});
freeName = name + 1;
return name;
}
bool isReserved(GLuint name)
bool isReserved(GLuint name) const
{
return map.find(name) != map.end();
}
......@@ -96,13 +96,8 @@ public:
return nullptr;
}
ObjectType *find(GLuint name)
ObjectType *find(GLuint name) const
{
if(name < baseName)
{
return nullptr;
}
auto element = map.find(name);
if(element == map.end())
......
src/OpenGL/libGL/Context.cpp
......@@ -116,7 +116,7 @@ Context::Context(const Context *shareContext)
mState.colorMaskAlpha = true;
mState.depthMask = true;
if(shareContext != NULL)
if(shareContext)
{
mResourceManager = shareContext->mResourceManager;
mResourceManager->addRef();
......@@ -149,8 +149,8 @@ Context::Context(const Context *shareContext)
mState.packAlignment = 4;
mState.unpackAlignment = 4;
mVertexDataManager = NULL;
mIndexDataManager = NULL;
mVertexDataManager = nullptr;
mIndexDataManager = nullptr;
mInvalidEnum = false;
mInvalidValue = false;
......@@ -210,46 +210,46 @@ Context::~Context()
mState.currentProgram = 0;
}
while(!mFramebufferMap.empty())
while(!mFramebufferNameSpace.empty())
{
deleteFramebuffer(mFramebufferMap.begin()->first);
deleteFramebuffer(mFramebufferNameSpace.firstName());
}
while(!mFenceMap.empty())
while(!mFenceNameSpace.empty())
{
deleteFence(mFenceMap.begin()->first);
deleteFence(mFenceNameSpace.firstName());
}
while(!mQueryMap.empty())
while(!mQueryNameSpace.empty())
{
deleteQuery(mQueryMap.begin()->first);
deleteQuery(mQueryNameSpace.firstName());
}
for(int type = 0; type < TEXTURE_TYPE_COUNT; type++)
{
for(int sampler = 0; sampler < MAX_COMBINED_TEXTURE_IMAGE_UNITS; sampler++)
{
mState.samplerTexture[type][sampler] = NULL;
mState.samplerTexture[type][sampler] = nullptr;
}
}
for(int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
{
mState.vertexAttribute[i].mBoundBuffer = NULL;
mState.vertexAttribute[i].mBoundBuffer = nullptr;
}
for(int i = 0; i < QUERY_TYPE_COUNT; i++)
{
mState.activeQuery[i] = NULL;
mState.activeQuery[i] = nullptr;
}
mState.arrayBuffer = NULL;
mState.elementArrayBuffer = NULL;
mState.renderbuffer = NULL;
mState.arrayBuffer = nullptr;
mState.elementArrayBuffer = nullptr;
mState.renderbuffer = nullptr;
mTexture2DZero = NULL;
mProxyTexture2DZero = NULL;
mTextureCubeMapZero = NULL;
mTexture2DZero = nullptr;
mProxyTexture2DZero = nullptr;
mTextureCubeMapZero = nullptr;
delete mVertexDataManager;
delete mIndexDataManager;
......@@ -699,7 +699,7 @@ GLuint Context::getArrayBufferName() const
GLuint Context::getActiveQuery(GLenum target) const
{
Query *queryObject = NULL;
Query *queryObject = nullptr;
switch(target)
{
......@@ -800,48 +800,18 @@ GLuint Context::createRenderbuffer()
// Returns an unused framebuffer name
GLuint Context::createFramebuffer()
{
//GLuint handle = mFramebufferNameSpace.allocate();
unsigned int handle = 1;
while(mFramebufferMap.find(handle) != mFramebufferMap.end())
{
handle++;
}
mFramebufferMap[handle] = NULL;
return handle;
return mFramebufferNameSpace.allocate();
}
GLuint Context::createFence()
{
//GLuint handle = mFenceNameSpace.allocate();
unsigned int handle = 1;
while (mFenceMap.find(handle) != mFenceMap.end())
{
handle++;
}
mFenceMap[handle] = new Fence;
return handle;
return mFenceNameSpace.allocate(new Fence());
}
// Returns an unused query name
GLuint Context::createQuery()
{
//GLuint handle = mQueryNameSpace.allocate();
unsigned int handle = 1;
while (mQueryMap.find(handle) != mQueryMap.end())
{
handle++;
}
mQueryMap[handle] = NULL;
return handle;
return mQueryNameSpace.allocate();
}
void Context::deleteBuffer(GLuint buffer)
......@@ -886,44 +856,33 @@ void Context::deleteRenderbuffer(GLuint renderbuffer)
void Context::deleteFramebuffer(GLuint framebuffer)
{
FramebufferMap::iterator framebufferObject = mFramebufferMap.find(framebuffer);
Framebuffer *framebufferObject = mFramebufferNameSpace.remove(framebuffer);
if(framebufferObject != mFramebufferMap.end())
if(framebufferObject)
{
detachFramebuffer(framebuffer);
//mFramebufferNameSpace.release(framebufferObject->first);
delete framebufferObject->second;
mFramebufferMap.erase(framebufferObject);
delete framebufferObject;
}
}
void Context::deleteFence(GLuint fence)
{
FenceMap::iterator fenceObject = mFenceMap.find(fence);
Fence *fenceObject = mFenceNameSpace.remove(fence);
if(fenceObject != mFenceMap.end())
if(fenceObject)
{
//mFenceNameSpace.release(fenceObject->first);
delete fenceObject->second;
mFenceMap.erase(fenceObject);
delete fenceObject;
}
}
void Context::deleteQuery(GLuint query)
{
QueryMap::iterator queryObject = mQueryMap.find(query);
if(queryObject != mQueryMap.end())
{
//mQueryNameSpace.release(queryObject->first);
Query *queryObject = mQueryNameSpace.remove(query);
if(queryObject->second)
if(queryObject)
{
queryObject->second->release();
}
mQueryMap.erase(queryObject);
queryObject->release();
}
}
......@@ -994,7 +953,7 @@ void Context::bindReadFramebuffer(GLuint framebuffer)
{
if(!getFramebuffer(framebuffer))
{
mFramebufferMap[framebuffer] = new Framebuffer();
mFramebufferNameSpace.insert(framebuffer, new Framebuffer());
}
mState.readFramebuffer = framebuffer;
......@@ -1004,7 +963,7 @@ void Context::bindDrawFramebuffer(GLuint framebuffer)
{
if(!getFramebuffer(framebuffer))
{
mFramebufferMap[framebuffer] = new Framebuffer();
mFramebufferNameSpace.insert(framebuffer, new Framebuffer());
}
mState.drawFramebuffer = framebuffer;
......@@ -1058,7 +1017,7 @@ void Context::beginQuery(GLenum target, GLuint query)
// no query may be active for either if glBeginQuery targets either.
for(int i = 0; i < QUERY_TYPE_COUNT; i++)
{
if(mState.activeQuery[i] != NULL)
if(mState.activeQuery[i])
{
return error(GL_INVALID_OPERATION);
}
......@@ -1116,20 +1075,20 @@ void Context::endQuery(GLenum target)
Query *queryObject = mState.activeQuery[qType];
if(queryObject == NULL)
if(!queryObject)
{
return error(GL_INVALID_OPERATION);
}
queryObject->end();
mState.activeQuery[qType] = NULL;
mState.activeQuery[qType] = nullptr;
}
void Context::setFramebufferZero(Framebuffer *buffer)
{
delete mFramebufferMap[0];
mFramebufferMap[0] = buffer;
delete mFramebufferNameSpace.remove(0);
mFramebufferNameSpace.insert(0, buffer);
}
void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
......@@ -1140,49 +1099,31 @@ void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
Framebuffer *Context::getFramebuffer(unsigned int handle)
{
FramebufferMap::iterator framebuffer = mFramebufferMap.find(handle);
if(framebuffer == mFramebufferMap.end())
{
return NULL;
}
else
{
return framebuffer->second;
}
return mFramebufferNameSpace.find(handle);
}
Fence *Context::getFence(unsigned int handle)
{
FenceMap::iterator fence = mFenceMap.find(handle);
if(fence == mFenceMap.end())
{
return NULL;
}
else
{
return fence->second;
}
return mFenceNameSpace.find(handle);
}
Query *Context::getQuery(unsigned int handle, bool create, GLenum type)
{
QueryMap::iterator query = mQueryMap.find(handle);
if(query == mQueryMap.end())
if(!mQueryNameSpace.isReserved(handle))
{
return NULL;
return nullptr;
}
else
{
if(!query->second && create)
Query *query = mQueryNameSpace.find(handle);
if(!query && create)
{
query->second = new Query(handle, type);
query->second->addRef();
query = new Query(handle, type);
query->addRef();
mQueryNameSpace.insert(handle, query);
}
return query->second;
return query;
}
}
......@@ -2694,19 +2635,19 @@ void Context::detachBuffer(GLuint buffer)
if(mState.arrayBuffer.name() == buffer)
{
mState.arrayBuffer = NULL;
mState.arrayBuffer = nullptr;
}
if(mState.elementArrayBuffer.name() == buffer)
{
mState.elementArrayBuffer = NULL;
mState.elementArrayBuffer = nullptr;
}
for(int attribute = 0; attribute < MAX_VERTEX_ATTRIBS; attribute++)
{
if(mState.vertexAttribute[attribute].mBoundBuffer.name() == buffer)
{
mState.vertexAttribute[attribute].mBoundBuffer = NULL;
mState.vertexAttribute[attribute].mBoundBuffer = nullptr;
}
}
}
......@@ -2722,7 +2663,7 @@ void Context::detachTexture(GLuint texture)
{
if(mState.samplerTexture[type][sampler].name() == texture)
{
mState.samplerTexture[type][sampler] = NULL;
mState.samplerTexture[type][sampler] = nullptr;
}
}
}
......@@ -3011,8 +2952,8 @@ void Context::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1
if(mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))
{
Renderbuffer *readDSBuffer = NULL;
Renderbuffer *drawDSBuffer = NULL;
Renderbuffer *readDSBuffer = nullptr;
Renderbuffer *drawDSBuffer = nullptr;
// We support OES_packed_depth_stencil, and do not support a separately attached depth and stencil buffer, so if we have
// both a depth and stencil buffer, it will be the same buffer.
......@@ -3083,7 +3024,7 @@ void Context::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1
if(blitDepthStencil)
{
bool success = device->stretchRect(readFramebuffer->getDepthStencil(), NULL, drawFramebuffer->getDepthStencil(), NULL, false);
bool success = device->stretchRect(readFramebuffer->getDepthStencil(), nullptr, drawFramebuffer->getDepthStencil(), nullptr, false);
if(!success)
{
......
src/OpenGL/libGL/Context.h
......@@ -753,17 +753,9 @@ private:
BindingPointer<Texture2D> mProxyTexture2DZero;
BindingPointer<TextureCubeMap> mTextureCubeMapZero;
typedef std::map<GLint, Framebuffer*> FramebufferMap;
FramebufferMap mFramebufferMap;
//NameSpace mFramebufferNameSpace;
typedef std::map<GLint, Fence*> FenceMap;
FenceMap mFenceMap;
//NameSpace mFenceNameSpace;
typedef std::map<GLint, Query*> QueryMap;
QueryMap mQueryMap;
//NameSpace mQueryNameSpace;
gl::NameSpace<Framebuffer> mFramebufferNameSpace;
gl::NameSpace<Fence, 0> mFenceNameSpace;
gl::NameSpace<Query> mQueryNameSpace;
VertexDataManager *mVertexDataManager;
IndexDataManager *mIndexDataManager;
......
src/OpenGL/libGLES_CM/Context.cpp
......@@ -245,9 +245,9 @@ Context::Context(const egl::Config *config, const Context *shareContext)
Context::~Context()
{
while(!mFramebufferMap.empty())
while(!mFramebufferNameSpace.empty())
{
deleteFramebuffer(mFramebufferMap.begin()->first);
deleteFramebuffer(mFramebufferNameSpace.firstName());
}
for(int type = 0; type < TEXTURE_TYPE_COUNT; type++)
......@@ -933,54 +933,39 @@ GLuint Context::createRenderbuffer()
// Returns an unused framebuffer name
GLuint Context::createFramebuffer()
{
GLuint handle = mFramebufferNameSpace.allocate();
mFramebufferMap[handle] = nullptr;
return handle;
return mFramebufferNameSpace.allocate();
}
void Context::deleteBuffer(GLuint buffer)
{
if(mResourceManager->getBuffer(buffer))
{
detachBuffer(buffer);
}
mResourceManager->deleteBuffer(buffer);
}
void Context::deleteTexture(GLuint texture)
{
if(mResourceManager->getTexture(texture))
{
detachTexture(texture);
}
mResourceManager->deleteTexture(texture);
}
void Context::deleteRenderbuffer(GLuint renderbuffer)
{
if(mResourceManager->getRenderbuffer(renderbuffer))
{
detachRenderbuffer(renderbuffer);
}
mResourceManager->deleteRenderbuffer(renderbuffer);
}
void Context::deleteFramebuffer(GLuint framebuffer)
{
FramebufferMap::iterator framebufferObject = mFramebufferMap.find(framebuffer);
if(framebufferObject != mFramebufferMap.end())
{
detachFramebuffer(framebuffer);
delete framebufferObject->second;
mFramebufferNameSpace.remove(framebufferObject->first);
mFramebufferMap.erase(framebufferObject);
Framebuffer *framebufferObject = mFramebufferNameSpace.remove(framebuffer);
if(framebufferObject)
{
delete framebufferObject;
}
}
......@@ -1036,7 +1021,7 @@ void Context::bindFramebuffer(GLuint framebuffer)
{
if(!getFramebuffer(framebuffer))
{
mFramebufferMap[framebuffer] = new Framebuffer();
mFramebufferNameSpace.insert(framebuffer, new Framebuffer());
}
mState.framebuffer = framebuffer;
......@@ -1051,8 +1036,8 @@ void Context::bindRenderbuffer(GLuint renderbuffer)
void Context::setFramebufferZero(Framebuffer *buffer)
{
delete mFramebufferMap[0];
mFramebufferMap[0] = buffer;
delete mFramebufferNameSpace.remove(0);
mFramebufferNameSpace.insert(0, buffer);
}
void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
......@@ -1063,16 +1048,7 @@ void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
Framebuffer *Context::getFramebuffer(unsigned int handle)
{
FramebufferMap::iterator framebuffer = mFramebufferMap.find(handle);
if(framebuffer == mFramebufferMap.end())
{
return nullptr;
}
else
{
return framebuffer->second;
}
return mFramebufferNameSpace.find(handle);
}
Buffer *Context::getArrayBuffer()
......
src/OpenGL/libGLES_CM/Context.h
......@@ -594,8 +594,6 @@ private:
gl::BindingPointer<Texture2D> mTexture2DZero;
gl::BindingPointer<TextureExternal> mTextureExternalZero;
typedef std::map<GLint, Framebuffer*> FramebufferMap;
FramebufferMap mFramebufferMap;
gl::NameSpace<Framebuffer> mFramebufferNameSpace;
VertexDataManager *mVertexDataManager;
......
src/OpenGL/libGLES_CM/ResourceManager.cpp
......@@ -86,7 +86,7 @@ void ResourceManager::deleteBuffer(GLuint buffer)
void ResourceManager::deleteTexture(GLuint texture)
{
Texture *textureObject = mTextureNameSpace.find(texture);
Texture *textureObject = mTextureNameSpace.remove(texture);
if(textureObject)
{
......@@ -96,7 +96,7 @@ void ResourceManager::deleteTexture(GLuint texture)
void ResourceManager::deleteRenderbuffer(GLuint renderbuffer)
{
Renderbuffer *renderbufferObject = mRenderbufferNameSpace.find(renderbuffer);
Renderbuffer *renderbufferObject = mRenderbufferNameSpace.remove(renderbuffer);
if(renderbufferObject)
{
......
src/OpenGL/libGLESv2/Context.cpp
......@@ -115,7 +115,7 @@ Context::Context(const egl::Config *config, const Context *shareContext, EGLint
mState.colorMaskAlpha = true;
mState.depthMask = true;
if(shareContext != NULL)
if(shareContext)
{
mResourceManager = shareContext->mResourceManager;
mResourceManager->addRef();
......@@ -164,8 +164,8 @@ Context::Context(const egl::Config *config, const Context *shareContext, EGLint
mState.unpackInfo.skipRows = 0;
mState.unpackInfo.skipImages = 0;
mVertexDataManager = NULL;
mIndexDataManager = NULL;
mVertexDataManager = nullptr;
mIndexDataManager = nullptr;
mInvalidEnum = false;
mInvalidValue = false;
......@@ -190,67 +190,67 @@ Context::~Context()
mState.currentProgram = 0;
}
while(!mFramebufferMap.empty())
while(!mFramebufferNameSpace.empty())
{
deleteFramebuffer(mFramebufferMap.begin()->first);
deleteFramebuffer(mFramebufferNameSpace.firstName());
}
while(!mFenceMap.empty())
while(!mFenceNameSpace.empty())
{
deleteFence(mFenceMap.begin()->first);
deleteFence(mFenceNameSpace.firstName());
}
while(!mQueryMap.empty())
while(!mQueryNameSpace.empty())
{
deleteQuery(mQueryMap.begin()->first);
deleteQuery(mQueryNameSpace.firstName());
}
while(!mVertexArrayMap.empty())
while(!mVertexArrayNameSpace.empty())
{
deleteVertexArray(mVertexArrayMap.begin()->first);
deleteVertexArray(mVertexArrayNameSpace.firstName());
}
while(!mTransformFeedbackMap.empty())
while(!mTransformFeedbackNameSpace.empty())
{
deleteTransformFeedback(mTransformFeedbackMap.begin()->first);
deleteTransformFeedback(mTransformFeedbackNameSpace.firstName());
}
for(int type = 0; type < TEXTURE_TYPE_COUNT; type++)
{
for(int sampler = 0; sampler < MAX_COMBINED_TEXTURE_IMAGE_UNITS; sampler++)
{
mState.samplerTexture[type][sampler] = NULL;
mState.samplerTexture[type][sampler] = nullptr;
}
}
for(int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
{
mState.vertexAttribute[i].mBoundBuffer = NULL;
mState.vertexAttribute[i].mBoundBuffer = nullptr;
}
for(int i = 0; i < QUERY_TYPE_COUNT; i++)
{
mState.activeQuery[i] = NULL;
mState.activeQuery[i] = nullptr;
}
mState.arrayBuffer = NULL;
mState.copyReadBuffer = NULL;
mState.copyWriteBuffer = NULL;
mState.pixelPackBuffer = NULL;
mState.pixelUnpackBuffer = NULL;
mState.genericUniformBuffer = NULL;
mState.renderbuffer = NULL;
mState.arrayBuffer = nullptr;
mState.copyReadBuffer = nullptr;
mState.copyWriteBuffer = nullptr;
mState.pixelPackBuffer = nullptr;
mState.pixelUnpackBuffer = nullptr;
mState.genericUniformBuffer = nullptr;
mState.renderbuffer = nullptr;
for(int i = 0; i < MAX_COMBINED_TEXTURE_IMAGE_UNITS; ++i)
{
mState.sampler[i] = NULL;
mState.sampler[i] = nullptr;
}
mTexture2DZero = NULL;
mTexture3DZero = NULL;
mTexture2DArrayZero = NULL;
mTextureCubeMapZero = NULL;
mTextureExternalZero = NULL;
mTexture2DZero = nullptr;
mTexture3DZero = nullptr;
mTexture2DArrayZero = nullptr;
mTextureCubeMapZero = nullptr;
mTextureExternalZero = nullptr;
delete mVertexDataManager;
delete mIndexDataManager;
......@@ -767,7 +767,7 @@ GLuint Context::getElementArrayBufferName() const
GLuint Context::getActiveQuery(GLenum target) const
{
Query *queryObject = NULL;
Query *queryObject = nullptr;
switch(target)
{
......@@ -921,40 +921,24 @@ GLuint Context::createRenderbuffer()
// Returns an unused framebuffer name
GLuint Context::createFramebuffer()
{
GLuint handle = mFramebufferNameSpace.allocate();
mFramebufferMap[handle] = NULL;
return handle;
return mFramebufferNameSpace.allocate();
}
GLuint Context::createFence()
{
GLuint handle = mFenceNameSpace.allocate();
mFenceMap[handle] = new Fence;
return handle;
return mFenceNameSpace.allocate(new Fence());
}
// Returns an unused query name
GLuint Context::createQuery()
{
GLuint handle = mQueryNameSpace.allocate();
mQueryMap[handle] = NULL;
return handle;
return mQueryNameSpace.allocate();
}
// Returns an unused vertex array name
GLuint Context::createVertexArray()
{
GLuint handle = mVertexArrayNameSpace.allocate();
mVertexArrayMap[handle] = nullptr;
return handle;
return mVertexArrayNameSpace.allocate();
}
GLsync Context::createFenceSync(GLenum condition, GLbitfield flags)
......@@ -967,11 +951,7 @@ GLsync Context::createFenceSync(GLenum condition, GLbitfield flags)
// Returns an unused transform feedback name
GLuint Context::createTransformFeedback()
{
GLuint handle = mTransformFeedbackNameSpace.allocate();
mTransformFeedbackMap[handle] = NULL;
return handle;
return mTransformFeedbackNameSpace.allocate();
}
// Returns an unused sampler name
......@@ -982,10 +962,7 @@ GLuint Context::createSampler()
void Context::deleteBuffer(GLuint buffer)
{
if(mResourceManager->getBuffer(buffer))
{
detachBuffer(buffer);
}
mResourceManager->deleteBuffer(buffer);
}
......@@ -1002,76 +979,52 @@ void Context::deleteProgram(GLuint program)
void Context::deleteTexture(GLuint texture)
{
if(mResourceManager->getTexture(texture))
{
detachTexture(texture);
}
mResourceManager->deleteTexture(texture);
}
void Context::deleteRenderbuffer(GLuint renderbuffer)
{
if(mResourceManager->getRenderbuffer(renderbuffer))
{
detachRenderbuffer(renderbuffer);
}
mResourceManager->deleteRenderbuffer(renderbuffer);
}
void Context::deleteFramebuffer(GLuint framebuffer)
{
FramebufferMap::iterator framebufferObject = mFramebufferMap.find(framebuffer);
if(framebufferObject != mFramebufferMap.end())
{
detachFramebuffer(framebuffer);
delete framebufferObject->second;
mFramebufferNameSpace.remove(framebufferObject->first);
mFramebufferMap.erase(framebufferObject);
Framebuffer *framebufferObject = mFramebufferNameSpace.remove(framebuffer);
if(framebufferObject)
{
delete framebufferObject;
}
}
void Context::deleteFence(GLuint fence)
{
FenceMap::iterator fenceObject = mFenceMap.find(fence);
Fence *fenceObject = mFenceNameSpace.remove(fence);
if(fenceObject != mFenceMap.end())
if(fenceObject)
{
delete fenceObject->second;
mFenceNameSpace.remove(fenceObject->first);
mFenceMap.erase(fenceObject);
delete fenceObject;
}
}
void Context::deleteQuery(GLuint query)
{
QueryMap::iterator queryObject = mQueryMap.find(query);
Query *queryObject = mQueryNameSpace.remove(query);
if(queryObject != mQueryMap.end())
{
if(queryObject->second)
if(queryObject)
{
queryObject->second->release();
}
mQueryNameSpace.remove(queryObject->first);
mQueryMap.erase(queryObject);
queryObject->release();
}
}
void Context::deleteVertexArray(GLuint vertexArray)
{
VertexArrayMap::iterator vertexArrayObject = mVertexArrayMap.find(vertexArray);
if(vertexArrayObject != mVertexArrayMap.end())
{
// Vertex array detachment is handled by Context, because 0 is a valid
// VAO, and a pointer to it must be passed from Context to State at
// binding time.
// [OpenGL ES 3.0.2] section 2.10 page 43:
// If a vertex array object that is currently bound is deleted, the binding
// for that object reverts to zero and the default vertex array becomes current.
......@@ -1080,9 +1033,11 @@ void Context::deleteVertexArray(GLuint vertexArray)
bindVertexArray(0);
}
delete vertexArrayObject->second;
mVertexArrayNameSpace.remove(vertexArrayObject->first);
mVertexArrayMap.erase(vertexArrayObject);
VertexArray *vertexArrayObject = mVertexArrayNameSpace.remove(vertexArray);
if(vertexArrayObject)
{
delete vertexArrayObject;
}
}
......@@ -1097,22 +1052,17 @@ void Context::deleteFenceSync(GLsync fenceSync)
void Context::deleteTransformFeedback(GLuint transformFeedback)
{
TransformFeedbackMap::iterator transformFeedbackObject = mTransformFeedbackMap.find(transformFeedback);
TransformFeedback *transformFeedbackObject = mTransformFeedbackNameSpace.remove(transformFeedback);
if(transformFeedbackObject != mTransformFeedbackMap.end())
if(transformFeedbackObject)
{
delete transformFeedbackObject->second;
mTransformFeedbackNameSpace.remove(transformFeedbackObject->first);
mTransformFeedbackMap.erase(transformFeedbackObject);
delete transformFeedbackObject;
}
}
void Context::deleteSampler(GLuint sampler)
{
if(mResourceManager->getSampler(sampler))
{
detachSampler(sampler);
}
mResourceManager->deleteSampler(sampler);
}
......@@ -1245,7 +1195,7 @@ void Context::bindReadFramebuffer(GLuint framebuffer)
{
if(!getFramebuffer(framebuffer))
{
mFramebufferMap[framebuffer] = new Framebuffer();
mFramebufferNameSpace.insert(framebuffer, new Framebuffer());
}
mState.readFramebuffer = framebuffer;
......@@ -1255,7 +1205,7 @@ void Context::bindDrawFramebuffer(GLuint framebuffer)
{
if(!getFramebuffer(framebuffer))
{
mFramebufferMap[framebuffer] = new Framebuffer();
mFramebufferNameSpace.insert(framebuffer, new Framebuffer());
}
mState.drawFramebuffer = framebuffer;
......@@ -1275,7 +1225,7 @@ void Context::bindVertexArray(GLuint array)
if(!vertexArray)
{
vertexArray = new VertexArray(array);
mVertexArrayMap[array] = vertexArray;
mVertexArrayNameSpace.insert(array, vertexArray);
}
mState.vertexArray = array;
......@@ -1311,16 +1261,14 @@ void Context::bindIndexedTransformFeedbackBuffer(GLuint buffer, GLuint index, GL
getTransformFeedback()->setBuffer(index, bufferObject, offset, size);
}
bool Context::bindTransformFeedback(GLuint id)
void Context::bindTransformFeedback(GLuint id)
{
if(!getTransformFeedback(id))
{
mTransformFeedbackMap[id] = new TransformFeedback(id);
mTransformFeedbackNameSpace.insert(id, new TransformFeedback(id));
}
mState.transformFeedback = id;
return true;
}
bool Context::bindSampler(GLuint unit, GLuint sampler)
......@@ -1378,7 +1326,7 @@ void Context::beginQuery(GLenum target, GLuint query)
// no query may be active for either if glBeginQuery targets either.
for(int i = 0; i < QUERY_TYPE_COUNT; i++)
{
if(mState.activeQuery[i] != NULL)
if(mState.activeQuery[i])
{
return error(GL_INVALID_OPERATION);
}
......@@ -1435,20 +1383,20 @@ void Context::endQuery(GLenum target)
Query *queryObject = mState.activeQuery[qType];
if(queryObject == NULL)
if(!queryObject)
{
return error(GL_INVALID_OPERATION);
}
queryObject->end();
mState.activeQuery[qType] = NULL;
mState.activeQuery[qType] = nullptr;
}
void Context::setFramebufferZero(Framebuffer *buffer)
{
delete mFramebufferMap[0];
mFramebufferMap[0] = buffer;
delete mFramebufferNameSpace.remove(0);
mFramebufferNameSpace.insert(0, buffer);
}
void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
......@@ -1459,30 +1407,12 @@ void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
Framebuffer *Context::getFramebuffer(unsigned int handle) const
{
FramebufferMap::const_iterator framebuffer = mFramebufferMap.find(handle);
if(framebuffer == mFramebufferMap.end())
{
return NULL;
}
else
{
return framebuffer->second;
}
return mFramebufferNameSpace.find(handle);
}
Fence *Context::getFence(unsigned int handle) const
{
FenceMap::const_iterator fence = mFenceMap.find(handle);
if(fence == mFenceMap.end())
{
return NULL;
}
else
{
return fence->second;
}
return mFenceNameSpace.find(handle);
}
FenceSync *Context::getFenceSync(GLsync handle) const
......@@ -1492,43 +1422,32 @@ FenceSync *Context::getFenceSync(GLsync handle) const
Query *Context::getQuery(unsigned int handle) const
{
QueryMap::const_iterator query = mQueryMap.find(handle);
if(query == mQueryMap.end())
{
return NULL;
}
else
{
return query->second;
}
return mQueryNameSpace.find(handle);
}
Query *Context::createQuery(unsigned int handle, GLenum type)
{
QueryMap::iterator query = mQueryMap.find(handle);
if(query == mQueryMap.end())
if(!mQueryNameSpace.isReserved(handle))
{
return NULL;
return nullptr;
}
else
{
if(!query->second)
Query *query = mQueryNameSpace.find(handle);
if(!query)
{
query->second = new Query(handle, type);
query->second->addRef();
query = new Query(handle, type);
query->addRef();
mQueryNameSpace.insert(handle, query);
}
return query->second;
return query;
}
}
VertexArray *Context::getVertexArray(GLuint array) const
{
VertexArrayMap::const_iterator vertexArray = mVertexArrayMap.find(array);
return (vertexArray == mVertexArrayMap.end()) ? nullptr : vertexArray->second;
return mVertexArrayNameSpace.find(array);
}
VertexArray *Context::getCurrentVertexArray() const
......@@ -1538,9 +1457,7 @@ VertexArray *Context::getCurrentVertexArray() const
bool Context::isVertexArray(GLuint array) const
{
VertexArrayMap::const_iterator vertexArray = mVertexArrayMap.find(array);
return vertexArray != mVertexArrayMap.end();
return mVertexArrayNameSpace.isReserved(array);
}
bool Context::hasZeroDivisor() const
......@@ -1561,9 +1478,7 @@ bool Context::hasZeroDivisor() const
TransformFeedback *Context::getTransformFeedback(GLuint transformFeedback) const
{
TransformFeedbackMap::const_iterator transformFeedbackObject = mTransformFeedbackMap.find(transformFeedback);
return (transformFeedbackObject == mTransformFeedbackMap.end()) ? NULL : transformFeedbackObject->second;
return mTransformFeedbackNameSpace.find(transformFeedback);
}
Sampler *Context::getSampler(GLuint sampler) const
......@@ -3740,7 +3655,7 @@ void Context::detachBuffer(GLuint buffer)
{
if(mState.vertexAttribute[attribute].mBoundBuffer.name() == buffer)
{
mState.vertexAttribute[attribute].mBoundBuffer = NULL;
mState.vertexAttribute[attribute].mBoundBuffer = nullptr;
}
}
}
......@@ -3757,7 +3672,7 @@ void Context::detachTexture(GLuint texture)
{
if(mState.samplerTexture[type][sampler].name() == texture)
{
mState.samplerTexture[type][sampler] = NULL;
mState.samplerTexture[type][sampler] = nullptr;
}
}
}
......@@ -3839,7 +3754,7 @@ void Context::detachSampler(GLuint sampler)
gl::BindingPointer<Sampler> &samplerBinding = mState.sampler[textureUnit];
if(samplerBinding.name() == sampler)
{
samplerBinding = NULL;
samplerBinding = nullptr;
}
}
}
......@@ -4095,8 +4010,8 @@ void Context::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1
if(mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))
{
Renderbuffer *readDSBuffer = NULL;
Renderbuffer *drawDSBuffer = NULL;
Renderbuffer *readDSBuffer = nullptr;
Renderbuffer *drawDSBuffer = nullptr;
if(mask & GL_DEPTH_BUFFER_BIT)
{
......@@ -4357,7 +4272,7 @@ const GLubyte* Context::getExtensions(GLuint index, GLuint* numExt) const
if(index == GL_INVALID_INDEX)
{
static GLubyte* extensionsCat = nullptr;
if((extensionsCat == nullptr) && (numExtensions > 0))
if(!extensionsCat && (numExtensions > 0))
{
int totalLength = numExtensions; // 1 space between each extension name + terminating null
for(unsigned int i = 0; i < numExtensions; i++)
......
src/OpenGL/libGLESv2/Context.h
......@@ -575,7 +575,7 @@ public:
void bindIndexedUniformBuffer(GLuint buffer, GLuint index, GLintptr offset, GLsizeiptr size);
void bindGenericTransformFeedbackBuffer(GLuint buffer);
void bindIndexedTransformFeedbackBuffer(GLuint buffer, GLuint index, GLintptr offset, GLsizeiptr size);
bool bindTransformFeedback(GLuint transformFeedback);
void bindTransformFeedback(GLuint transformFeedback);
bool bindSampler(GLuint unit, GLuint sampler);
void useProgram(GLuint program);
......@@ -709,24 +709,10 @@ private:
gl::BindingPointer<TextureCubeMap> mTextureCubeMapZero;
gl::BindingPointer<TextureExternal> mTextureExternalZero;
typedef std::map<GLint, Framebuffer*> FramebufferMap;
FramebufferMap mFramebufferMap;
gl::NameSpace<Framebuffer> mFramebufferNameSpace;
typedef std::map<GLint, Fence*> FenceMap;
FenceMap mFenceMap;
gl::NameSpace<Fence, 0> mFenceNameSpace;
typedef std::map<GLint, Query*> QueryMap;
QueryMap mQueryMap;
gl::NameSpace<Query> mQueryNameSpace;
typedef std::map<GLint, VertexArray*> VertexArrayMap;
VertexArrayMap mVertexArrayMap;
gl::NameSpace<VertexArray> mVertexArrayNameSpace;
typedef std::map<GLint, TransformFeedback*> TransformFeedbackMap;
TransformFeedbackMap mTransformFeedbackMap;
gl::NameSpace<TransformFeedback> mTransformFeedbackNameSpace;
VertexDataManager *mVertexDataManager;
......
src/OpenGL/libGLESv2/libGLESv3.cpp
......@@ -3576,10 +3576,7 @@ GL_APICALL void GL_APIENTRY glBindTransformFeedback(GLenum target, GLuint id)
return error(GL_INVALID_OPERATION);
}
if(!context->bindTransformFeedback(id))
{
return error(GL_INVALID_OPERATION);
}
context->bindTransformFeedback(id);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment