Fix renderability test.
Half-float formats are renderable due to GL_EXT_color_buffer_half_float.
Change-Id: I4c3716f578cb4a5dd32f2b22265df4263e9834cc
Reviewed-on: https://swiftshader-review.googlesource.com/5127
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 28838c8..f750ea4 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -4694,10 +4694,7 @@
case GL_RGBA16I:
case GL_RGBA32I:
case GL_RGBA32UI:
- case GL_R16F:
- case GL_RG16F:
case GL_R11F_G11F_B10F:
- case GL_RGBA16F:
case GL_R32F:
case GL_RG32F:
case GL_RGB32F:
@@ -4712,6 +4709,10 @@
case GL_RGB565:
case GL_RGB8_OES:
case GL_RGBA8_OES:
+ case GL_R16F:
+ case GL_RG16F:
+ case GL_RGB16F:
+ case GL_RGBA16F:
context->setRenderbufferStorage(new es2::Colorbuffer(width, height, internalformat, samples));
break;
case GL_STENCIL_INDEX8:
diff --git a/src/OpenGL/libGLESv2/utilities.cpp b/src/OpenGL/libGLESv2/utilities.cpp
index 526ac60..d308fdc 100644
--- a/src/OpenGL/libGLESv2/utilities.cpp
+++ b/src/OpenGL/libGLESv2/utilities.cpp
@@ -989,6 +989,16 @@
{
switch(internalformat)
{
+ case GL_RGBA4:
+ case GL_RGB5_A1:
+ case GL_RGB565:
+ case GL_RGB8_OES:
+ case GL_RGBA8_OES:
+ case GL_R16F:
+ case GL_RG16F:
+ case GL_RGB16F:
+ case GL_RGBA16F:
+ return true;
case GL_R8:
case GL_R8UI:
case GL_R8I:
@@ -1012,19 +1022,7 @@
case GL_RGBA16I:
case GL_RGBA32I:
case GL_RGBA32UI:
- case GL_RGBA4:
- case GL_RGB5_A1:
- case GL_RGB565:
- case GL_RGB8_OES:
- case GL_RGBA8_OES:
- case GL_RGB:
- case GL_RGBA:
- return true;
- case GL_R16F:
- case GL_RG16F:
case GL_R11F_G11F_B10F:
- case GL_RGB16F:
- case GL_RGBA16F:
case GL_R32F:
case GL_RG32F:
case GL_RGB32F:
