aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-06-27 16:38:46 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-27 16:38:46 -0700
commitb540ab81e5b17c0ab607e483e4494393b06751b1 (patch)
tree0c513a67f97598c4ce3a7f34637ab5c8941606c9
parentb1e16aa79fbe4196a8b87bc0e42d507da276e8de (diff)
parent307c6c18a3a6eb80ca2d868853e5b2892ef1c3f8 (diff)
downloadsdk-b540ab81e5b17c0ab607e483e4494393b06751b1.zip
sdk-b540ab81e5b17c0ab607e483e4494393b06751b1.tar.gz
sdk-b540ab81e5b17c0ab607e483e4494393b06751b1.tar.bz2
Merge "Use linear filtering for colorbuffer textures"
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp
index 681db8b..e50b8ec 100644
--- a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp
@@ -66,8 +66,8 @@ ColorBuffer *ColorBuffer::create(int p_width, int p_height,
texInternalFormat,
GL_UNSIGNED_BYTE, zBuff);
delete [] zBuff;
- s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
s_gl.glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);