Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present" am: 4929480c4...

am: 3664e44402

Change-Id: I06969414b3a1d4d1a396e5432bac58fd3fefffe0

diff --git a/android/cts/Android.mk b/android/cts/Android.mk
index 2eb34f7..762eb2a 100644 (file)
--- a/android/cts/Android.mk
+++ b/android/cts/Android.mk
@@ -21,7 +21,7 @@ LOCAL_MODULE := CtsDeqpTestCases
 LOCAL_MODULE_TAGS := optional
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
 
 LOCAL_SDK_VERSION := 22
 

diff --git a/android/package/Android.mk b/android/package/Android.mk
index 00db989..210ac5b 100644 (file)
--- a/android/package/Android.mk
+++ b/android/package/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts vts
 
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
 LOCAL_JNI_SHARED_LIBRARIES := libdeqp

diff --git a/modules/gles31/functional/es31fNegativeComputeTests.cpp b/modules/gles31/functional/es31fNegativeComputeTests.cpp
index 8fc9f10..eb2e0ec 100644 (file)
--- a/modules/gles31/functional/es31fNegativeComputeTests.cpp
+++ b/modules/gles31/functional/es31fNegativeComputeTests.cpp
@@ -248,7 +248,7 @@ void exceed_texture_image_units_limit (NegativeTestContext& ctx)
 
                ctx.beginSection("GL_INVALID_OPERATION error is generated if the sum of the number of active samplers for each active program exceeds the maximum number of texture image units allowed");
                ctx.glDispatchCompute(1, 1, 1);
-               ctx.expectError(GL_INVALID_VALUE);
+               ctx.expectError(GL_INVALID_OPERATION);
                ctx.endSection();
        }
 }