Skip to content

S
swiftshader
Commit 5767099d by Nicolas Capens
Options

Fix glGetInternalformativ()

Change-Id: Id2c07064a68158d3a4d57974244feae1c15e2fa1 Reviewed-on: https://swiftshader-review.googlesource.com/3940Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 460e41f2
Showing with 14 additions and 14 deletions
src/OpenGL/libGLESv2/Framebuffer.h
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
GLuint getStencilbufferName(); GLuint getStencilbufferName();
GLint getColorbufferLayer(GLuint index); GLint getColorbufferLayer(GLuint index);
GLint getDepthbufferLayer(); GLint getDepthbufferLayer();
GLint getStencilbufferLayer(); GLint getStencilbufferLayer();
bool hasStencil(); bool hasStencil();
......
src/OpenGL/libGLESv2/libGLESv2.cpp
...@@ -7021,9 +7021,9 @@ void TexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei wi ...@@ -7021,9 +7021,9 @@ void TexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei wi
void TexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels) void TexSubImage3DOES(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, " 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, " "GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = %p)", "GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = %p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
switch(target) switch(target)
{ {
...@@ -7064,8 +7064,8 @@ void TexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, ...@@ -7064,8 +7064,8 @@ void TexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset,
void CopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) void CopyTexSubImage3DOES(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, " 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)", "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) switch(target)
{ {
...@@ -7112,8 +7112,8 @@ void CopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffs ...@@ -7112,8 +7112,8 @@ void CopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffs
void CompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data) void CompressedTexImage3DOES(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, " 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 = %p)", "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = %p)",
target, level, internalformat, width, height, depth, border, imageSize, data); target, level, internalformat, width, height, depth, border, imageSize, data);
switch(target) switch(target)
{ {
...@@ -7175,9 +7175,9 @@ void CompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, ...@@ -7175,9 +7175,9 @@ void CompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat,
void CompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data) void CompressedTexSubImage3DOES(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, " 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, " "GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLsizei imageSize = %d, const void *data = %p)", "GLenum format = 0x%X, GLsizei imageSize = %d, const void *data = %p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
switch(target) switch(target)
{ {
...@@ -7221,7 +7221,7 @@ void CompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint ...@@ -7221,7 +7221,7 @@ void CompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint
void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) void FramebufferTexture3DOES(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, " 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); "GLuint texture = %d, GLint level = %d, GLint zoffset = %d)", target, attachment, textarget, texture, level, zoffset);
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE) if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
{ {
......
src/OpenGL/libGLESv2/libGLESv3.cpp
...@@ -3987,10 +3987,10 @@ GL_APICALL void GL_APIENTRY glGetInternalformativ(GLenum target, GLenum internal ...@@ -3987,10 +3987,10 @@ GL_APICALL void GL_APIENTRY glGetInternalformativ(GLenum target, GLenum internal
switch(pname) switch(pname)
{ {
case GL_SAMPLES: case GL_NUM_SAMPLE_COUNTS:
*params = supportedMultiSampleDepths.size(); *params = supportedMultiSampleDepths.size();
break; break;
case GL_NUM_SAMPLE_COUNTS: case GL_SAMPLES:
{ {
size_t returnCount = std::min<size_t>(bufSize, supportedMultiSampleDepths.size()); size_t returnCount = std::min<size_t>(bufSize, supportedMultiSampleDepths.size());
for(size_t sampleIndex = 0; sampleIndex < returnCount; ++sampleIndex) for(size_t sampleIndex = 0; sampleIndex < returnCount; ++sampleIndex)
......
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