commit dbfa611bc53481db88e20192491747a2c87702a3
author Bo Hu <bohu@google.com> Fri Mar 27 16:43:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 16:43:21 2015 +0000
tree 08032b3fb605d5eaf7240cca6323f3cb9a22251c
parent 2b763c9fec35bcab3689785ad808a4317772acae
parent b3f642f2a22cd58e64e0dc6326e946ef7fd7589f

Merge "Fix inconsistant results for some cts tests."

fstab.goldfish

diff --git a/fstab.goldfish b/fstab.goldfish
index 0a67f1d..d2d42b7 100644
--- a/fstab.goldfish
+++ b/fstab.goldfish
@@ -5,4 +5,4 @@
 /dev/block/mtdblock0                                    /system             ext4      ro,barrier=1                                         wait
 /dev/block/mtdblock1                                    /data               ext4      noatime,nosuid,nodev,barrier=1,nomblk_io_submit      wait,check
 /dev/block/mtdblock2                                    /cache              ext4      noatime,nosuid,nodev  wait,check
-/devices/platform/goldfish_mmc.0                        auto                vfat      defaults                                             voldmanaged=sdcard:auto
+/devices/platform/goldfish_mmc.0                        auto                vfat      defaults                                             voldmanaged=sdcard:auto,noemulatedsd

opengl/system/GLESv2_enc/GL2Encoder.cpp

diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp
index 18c796e..dca504d 100755
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -765,6 +765,8 @@
 GLuint GL2Encoder::s_glCreateShader(void *self, GLenum shaderType)
 {
     GL2Encoder *ctx = (GL2Encoder*)self;
+    RET_AND_SET_ERROR_IF(((shaderType != GL_VERTEX_SHADER) && (shaderType != GL_FRAGMENT_SHADER)),
+        GL_INVALID_ENUM, 0);
     GLuint shader = ctx->m_glCreateShader_enc(self, shaderType);
     if (shader != 0) {
         if (!ctx->m_shared->addShaderData(shader)) {