Fixed a couple of regressions from namespace refactoring

From the ES3 spec, section 4.4.2 (about DeleteRenderbuffers): "Unused names in renderbuffers are silently ignored, as is the value zero." And from section 6.1.5: "IsSampler will return TRUE if sampler is the name of a sampler object previously returned from a call to GenSamplers and FALSE otherwise". Also, glIsSampler can use Context::isSampler(), which uses ResourceManager::isSampler(), which should only look whether a name has been reserved, not whether the object is allocated. Note: Even though the spec mentions (about Sampler objects): "they acquire state only when they are first used as a parameter to BindSampler, SamplerParameter*, GetSamplerParameter*, or IsSampler", it shouldn't hurt to not allocate the object when calling IsSampler, since a subsequent call to any other Sampler object related function should allocate it. Change-Id: I69c9d8bbcf93231747b913c0afbd970c78d02cf1 Reviewed-on: https://swiftshader-review.googlesource.com/5161Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fixed a couple of regressions from namespace refactoring
889faf04 · Alexis Hetu · Alexis Hétu · 094f2bf1 · 889faf04 · 889faf04
Commit 889faf04 authored Apr 19, 2016 by Alexis Hetu Committed by Alexis Hétu Apr 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

Context.cpp src/OpenGL/libGLESv2/Context.cpp +4 -1

ResourceManager.cpp src/OpenGL/libGLESv2/ResourceManager.cpp +1 -1

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +1 -3

No files found.
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -987,7 +987,10 @@ void Context::deleteTexture(GLuint texture)
 void Context::deleteRenderbuffer(GLuint renderbuffer)
 {
-	detachRenderbuffer(renderbuffer);
+	if(mResourceManager->getRenderbuffer(renderbuffer))
+	{
+		detachRenderbuffer(renderbuffer);
+	}
    mResourceManager->deleteRenderbuffer(renderbuffer);
 }

--- a/src/OpenGL/libGLESv2/ResourceManager.cpp
+++ b/src/OpenGL/libGLESv2/ResourceManager.cpp
@@ -341,7 +341,7 @@ void ResourceManager::checkSamplerAllocation(GLuint sampler)
 bool ResourceManager::isSampler(GLuint sampler)
 {
-	return mSamplerNameSpace.find(sampler) != nullptr;
+	return mSamplerNameSpace.isReserved(sampler);
 }
 }
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -3392,9 +3392,7 @@ GL_APICALL GLboolean GL_APIENTRY glIsSampler(GLuint sampler)
 	if(context)
 	{
-		es2::Sampler *samplerObject = context->getSampler(sampler);
+		if(context->isSampler(sampler))
-		if(samplerObject)
 		{
 			return GL_TRUE;
 		}