Make the Object class independent of the GL version.
Bug 18962347
Change-Id: Ica99629bf58e799d6552d4a92ce3ae3eff57da27
Reviewed-on: https://swiftshader-review.googlesource.com/1880
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index f354579..abd0280 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -343,9 +343,9 @@
}
}
-void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id)
+void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint name)
{
- TRACE("(GLenum target = 0x%X, GLuint %d)", target, id);
+ TRACE("(GLenum target = 0x%X, GLuint name = %d)", target, name);
switch(target)
{
@@ -356,7 +356,7 @@
return error(GL_INVALID_ENUM);
}
- if(id == 0)
+ if(name == 0)
{
return error(GL_INVALID_OPERATION);
}
@@ -365,7 +365,7 @@
if(context)
{
- context->beginQuery(target, id);
+ context->beginQuery(target, name);
}
}
@@ -1154,7 +1154,7 @@
return error(GL_INVALID_FRAMEBUFFER_OPERATION);
}
- if(context->getReadFramebufferHandle() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
+ if(context->getReadFramebufferName() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
{
return error(GL_INVALID_OPERATION);
}
@@ -1235,7 +1235,7 @@
return error(GL_INVALID_FRAMEBUFFER_OPERATION);
}
- if(context->getReadFramebufferHandle() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
+ if(context->getReadFramebufferName() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
{
return error(GL_INVALID_OPERATION);
}
@@ -1818,19 +1818,19 @@
if(context)
{
es2::Framebuffer *framebuffer = NULL;
- GLuint framebufferHandle = 0;
+ GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
{
framebuffer = context->getReadFramebuffer();
- framebufferHandle = context->getReadFramebufferHandle();
+ framebufferName = context->getReadFramebufferName();
}
else
{
framebuffer = context->getDrawFramebuffer();
- framebufferHandle = context->getDrawFramebufferHandle();
+ framebufferName = context->getDrawFramebufferName();
}
- if(!framebuffer || (framebufferHandle == 0 && renderbuffer != 0))
+ if(!framebuffer || (framebufferName == 0 && renderbuffer != 0))
{
return error(GL_INVALID_OPERATION);
}
@@ -1924,19 +1924,19 @@
}
es2::Framebuffer *framebuffer = NULL;
- GLuint framebufferHandle = 0;
+ GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
{
framebuffer = context->getReadFramebuffer();
- framebufferHandle = context->getReadFramebufferHandle();
+ framebufferName = context->getReadFramebufferName();
}
else
{
framebuffer = context->getDrawFramebuffer();
- framebufferHandle = context->getDrawFramebufferHandle();
+ framebufferName = context->getDrawFramebufferName();
}
- if(framebufferHandle == 0 || !framebuffer)
+ if(framebufferName == 0 || !framebuffer)
{
return error(GL_INVALID_OPERATION);
}
@@ -2466,7 +2466,7 @@
es2::Framebuffer *framebuffer = NULL;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
{
- if(context->getReadFramebufferHandle() == 0)
+ if(context->getReadFramebufferName() == 0)
{
return error(GL_INVALID_OPERATION);
}
@@ -2475,7 +2475,7 @@
}
else
{
- if(context->getDrawFramebufferHandle() == 0)
+ if(context->getDrawFramebufferName() == 0)
{
return error(GL_INVALID_OPERATION);
}
@@ -2489,15 +2489,15 @@
{
case GL_COLOR_ATTACHMENT0:
attachmentType = framebuffer->getColorbufferType();
- attachmentHandle = framebuffer->getColorbufferHandle();
+ attachmentHandle = framebuffer->getColorbufferName();
break;
case GL_DEPTH_ATTACHMENT:
attachmentType = framebuffer->getDepthbufferType();
- attachmentHandle = framebuffer->getDepthbufferHandle();
+ attachmentHandle = framebuffer->getDepthbufferName();
break;
case GL_STENCIL_ATTACHMENT:
attachmentType = framebuffer->getStencilbufferType();
- attachmentHandle = framebuffer->getStencilbufferHandle();
+ attachmentHandle = framebuffer->getStencilbufferName();
break;
default:
return error(GL_INVALID_ENUM);
@@ -2724,9 +2724,9 @@
}
}
-void GL_APIENTRY glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
+void GL_APIENTRY glGetQueryObjectuivEXT(GLuint name, GLenum pname, GLuint *params)
{
- TRACE("(GLuint id = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params);
+ TRACE("(GLuint name = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", name, pname, params);
switch(pname)
{
@@ -2741,14 +2741,14 @@
if(context)
{
- es2::Query *queryObject = context->getQuery(id, false, GL_NONE);
+ es2::Query *queryObject = context->getQuery(name, false, GL_NONE);
if(!queryObject)
{
return error(GL_INVALID_OPERATION);
}
- if(context->getActiveQuery(queryObject->getType()) == id)
+ if(context->getActiveQuery(queryObject->getType()) == name)
{
return error(GL_INVALID_OPERATION);
}
@@ -2780,12 +2780,12 @@
return error(GL_INVALID_ENUM);
}
- if(context->getRenderbufferHandle() == 0)
+ if(context->getRenderbufferName() == 0)
{
return error(GL_INVALID_OPERATION);
}
- es2::Renderbuffer *renderbuffer = context->getRenderbuffer(context->getRenderbufferHandle());
+ es2::Renderbuffer *renderbuffer = context->getRenderbuffer(context->getRenderbufferName());
switch(pname)
{
@@ -3296,7 +3296,7 @@
*params = (GLfloat)(attribState.mNormalized ? GL_TRUE : GL_FALSE);
break;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
- *params = (GLfloat)attribState.mBoundBuffer.id();
+ *params = (GLfloat)attribState.mBoundBuffer.name();
break;
case GL_CURRENT_VERTEX_ATTRIB:
for(int i = 0; i < 4; ++i)
@@ -3342,7 +3342,7 @@
*params = (attribState.mNormalized ? GL_TRUE : GL_FALSE);
break;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
- *params = attribState.mBoundBuffer.id();
+ *params = attribState.mBoundBuffer.name();
break;
case GL_CURRENT_VERTEX_ATTRIB:
for(int i = 0; i < 4; ++i)
@@ -3511,11 +3511,11 @@
return GL_FALSE;
}
-GLboolean GL_APIENTRY glIsQueryEXT(GLuint id)
+GLboolean GL_APIENTRY glIsQueryEXT(GLuint name)
{
- TRACE("(GLuint id = %d)", id);
+ TRACE("(GLuint name = %d)", name);
- if(id == 0)
+ if(name == 0)
{
return GL_FALSE;
}
@@ -3524,7 +3524,7 @@
if(context)
{
- es2::Query *queryObject = context->getQuery(id, false, GL_NONE);
+ es2::Query *queryObject = context->getQuery(name, false, GL_NONE);
if(queryObject)
{
@@ -3757,7 +3757,7 @@
return error(GL_INVALID_VALUE);
}
- GLuint handle = context->getRenderbufferHandle();
+ GLuint handle = context->getRenderbufferName();
if(handle == 0)
{
return error(GL_INVALID_OPERATION);
@@ -5159,7 +5159,7 @@
if(context)
{
- if(context->getReadFramebufferHandle() == context->getDrawFramebufferHandle())
+ if(context->getReadFramebufferName() == context->getDrawFramebufferName())
{
ERR("Blits with the same source and destination framebuffer are not supported by this implementation.");
return error(GL_INVALID_OPERATION);
@@ -5234,13 +5234,13 @@
}
}
-void GL_APIENTRY glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
-{
+void GL_APIENTRY glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
+{
TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = 0x%0.8p)",
- target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-
+ target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+
switch(target)
{
case GL_TEXTURE_3D_OES:
@@ -5274,28 +5274,28 @@
{
texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackAlignment(), pixels);
}
- }
-}
-
-void GL_APIENTRY glCopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
+ }
+}
+
+void GL_APIENTRY glCopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
- target, level, xoffset, yoffset, zoffset, x, y, width, height);
-
+ target, level, xoffset, yoffset, zoffset, x, y, width, height);
+
switch(target)
{
case GL_TEXTURE_3D_OES:
break;
default:
return error(GL_INVALID_ENUM);
- }
-
+ }
+
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
return error(GL_INVALID_VALUE);
- }
-
+ }
+
es2::Context *context = es2::getContext();
if(context)
@@ -5307,7 +5307,7 @@
return error(GL_INVALID_FRAMEBUFFER_OPERATION);
}
- if(context->getReadFramebufferHandle() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
+ if(context->getReadFramebufferName() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
{
return error(GL_INVALID_OPERATION);
}
@@ -5329,11 +5329,11 @@
}
texture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, framebuffer);
- }
-}
-
-void GL_APIENTRY glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
-{
+ }
+}
+
+void GL_APIENTRY glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
+{
TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "
"GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, imageSize, data);
@@ -5344,7 +5344,7 @@
break;
default:
return error(GL_INVALID_ENUM);
- }
+ }
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
@@ -5397,23 +5397,23 @@
}
texture->setCompressedImage(level, internalformat, width, height, depth, imageSize, data);
- }
-}
-
-void GL_APIENTRY glCompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
-{
+ }
+}
+
+void GL_APIENTRY glCompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
+{
TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLsizei imageSize = %d, const void *data = 0x%0.8p)",
- target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-
+ target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+
switch(target)
{
case GL_TEXTURE_3D_OES:
break;
default:
return error(GL_INVALID_ENUM);
- }
+ }
if(xoffset < 0 || yoffset < 0 || zoffset < 0 || !validImageSize(level, width, height) || depth < 0 || imageSize < 0)
{
@@ -5440,12 +5440,12 @@
if(width == 0 || height == 0 || depth == 0 || data == NULL)
{
return;
- }
-
+ }
+
es2::Context *context = es2::getContext();
if(context)
- {
+ {
es2::Texture3D *texture = context->getTexture3D();
if(!texture)
@@ -5455,10 +5455,10 @@
texture->subImageCompressed(level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
}
-}
-
-void GL_APIENTRY glFramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
-{
+}
+
+void GL_APIENTRY glFramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
+{
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
"GLuint texture = %d, GLint level = %d, GLint zoffset = %d)", target, attachment, textarget, texture, level, zoffset);
@@ -5518,19 +5518,19 @@
}
es2::Framebuffer *framebuffer = NULL;
- GLuint framebufferHandle = 0;
+ GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
{
framebuffer = context->getReadFramebuffer();
- framebufferHandle = context->getReadFramebufferHandle();
+ framebufferName = context->getReadFramebufferName();
}
else
{
framebuffer = context->getDrawFramebuffer();
- framebufferHandle = context->getDrawFramebufferHandle();
+ framebufferName = context->getDrawFramebufferName();
}
- if(framebufferHandle == 0 || !framebuffer)
+ if(framebufferName == 0 || !framebuffer)
{
return error(GL_INVALID_OPERATION);
}
@@ -5541,8 +5541,8 @@
case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture); break;
case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture); break;
}
- }
-}
+ }
+}
void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
{