commit 14f0571f14b0378827b6410d607f646dea96a7b7
author Yurii Zubrytskyi <zyy@google.com> Fri Nov 18 23:01:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 18 23:01:31 2016 +0000
tree 3d142eff8c5c9350db8f183e41d42503f67dc40c
parent 0ef469c71991b1ed5dc95fce9ff0acbacfa7bda3
parent f2896093c0fa2bd2e7b2d8f65e8acf4ce95191d0

Merge "[gl] Increase the color precision in TextureResize" into emu-master-dev

distrib/android-emugl/host/libs/libOpenglRender/TextureResize.cpp

diff --git a/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.cpp b/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.cpp
index 746b022..46cad8c 100644
--- a/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.cpp
+++ b/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.cpp
@@ -17,10 +17,13 @@
 #include "TextureResize.h"
 
 #include "DispatchTables.h"
-
+#include "FrameBuffer.h"
 #include "android/utils/debug.h"
 
+#include "GLES2/gl2ext.h"
+
 #include <stdio.h>
+#include <string.h>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -196,6 +199,18 @@
         mFactor(1),
         mFBWidth({0,}),
         mFBHeight({0,}) {
+    // SwiftShader strictly follows the GLESv2 spec and doesn't allow rendering
+    // into full GL_FLOAT textures. Let's detect it and reduce the precision
+    // on demand. BTW, GL_HALF_FLOAT is also only present in GLESv3, so use the
+    // extension instead.
+    const char* vendor, *renderer, *version;
+    FrameBuffer::getFB()->getGLStrings(&vendor, &renderer, &version);
+    if (renderer && strstr(renderer, "SwiftShader")) {
+        mTextureDataType = GL_HALF_FLOAT_OES;
+    } else {
+        mTextureDataType = GL_FLOAT;
+    }
+
     s_gles2.glGenTextures(1, &mFBWidth.texture);
     s_gles2.glBindTexture(GL_TEXTURE_2D, mFBWidth.texture);
     s_gles2.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -284,15 +299,17 @@
     // Update the framebuffer sizes to match the new factor.
     s_gles2.glBindTexture(GL_TEXTURE_2D, mFBWidth.texture);
     s_gles2.glTexImage2D(
-        GL_TEXTURE_2D, 0, GL_RGB, mWidth / factor, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
+        GL_TEXTURE_2D, 0, GL_RGB, mWidth / factor, mHeight, 0, GL_RGB,
+                mTextureDataType, nullptr);
     s_gles2.glBindTexture(GL_TEXTURE_2D, 0);
     s_gles2.glBindFramebuffer(GL_FRAMEBUFFER, mFBWidth.framebuffer);
     s_gles2.glFramebufferTexture2D(
         GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mFBWidth.texture, 0);
 
     s_gles2.glBindTexture(GL_TEXTURE_2D, mFBHeight.texture);
-    s_gles2.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, mWidth / factor, mHeight / factor, 0, GL_RGB,
-        GL_UNSIGNED_BYTE, nullptr);
+    s_gles2.glTexImage2D(
+        GL_TEXTURE_2D, 0, GL_RGB, mWidth / factor, mHeight / factor, 0, GL_RGB,
+                mTextureDataType, nullptr);
     s_gles2.glBindTexture(GL_TEXTURE_2D, 0);
     s_gles2.glBindFramebuffer(GL_FRAMEBUFFER, mFBHeight.framebuffer);
     s_gles2.glFramebufferTexture2D(

distrib/android-emugl/host/libs/libOpenglRender/TextureResize.h

diff --git a/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.h b/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.h
index 3dd9d31..0fc0a82 100644
--- a/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.h
+++ b/distrib/android-emugl/host/libs/libOpenglRender/TextureResize.h
@@ -46,6 +46,7 @@
     Framebuffer mFBWidth;
     Framebuffer mFBHeight;
     GLuint mVertexBuffer;
+    GLenum mTextureDataType;
 };
 
 #endif