Skip to content

Commit

Permalink
move robust_buffer_access_behavior tests to NoContext group
Browse files Browse the repository at this point in the history 
VK-GL-CTS Issue: 2575

Cribbed some ideas from the glcRobustnessTests.cpp tests which are already in the
NoContext group.
Didn't really want to touch the ES version of the tests on this old GL-specific branch
but it was necessary to make them compile. This also necessitated removing the skips
for these tests (since they no longer exist as named). I don't expect anyone cares about
the ES tests here, but they do work now.

Components: Framework, OpenGL, OpenGL ES

Affects:
KHR-GL4{3456}.robust_buffer_access_behavior.* (removed)
KHR-GLES32.robust.robust_buffer_access_behavior.* (removed)
KHR-NoContext.gl43.robust_buffer_access_behavior.* (added)
KHR-NoContext.es32.robust_buffer_access_behavior.* (added)


Change-Id: If5198e05863547e79074ca15f48ae16b969040f4
  • Loading branch information
@dgkoch
dgkoch committed Sep 9, 2020
1 parent 75e2e59 commit dfc5773
Show file tree
Hide file tree
Showing 19 changed files with 378 additions and 322 deletions.
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3766,11 +3766,6 @@ KHR-GL43.compute_shader.api-indirect
KHR-GL43.compute_shader.api-program
KHR-GL43.compute_shader.glsl-compile-time-errors
KHR-GL43.compute_shader.glsl-link-time-errors
KHR-GL43.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GL43.robust_buffer_access_behavior.texel_fetch
KHR-GL43.robust_buffer_access_behavior.image_load_store
KHR-GL43.robust_buffer_access_behavior.storage_buffer
KHR-GL43.robust_buffer_access_behavior.uniform_buffer
KHR-GL43.shader_storage_buffer_object.basic-basic
KHR-GL43.shader_storage_buffer_object.basic-basic-cs
KHR-GL43.shader_storage_buffer_object.basic-max
Expand Down
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3766,11 +3766,6 @@ KHR-GL44.compute_shader.api-indirect
KHR-GL44.compute_shader.api-program
KHR-GL44.compute_shader.glsl-compile-time-errors
KHR-GL44.compute_shader.glsl-link-time-errors
KHR-GL44.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GL44.robust_buffer_access_behavior.texel_fetch
KHR-GL44.robust_buffer_access_behavior.image_load_store
KHR-GL44.robust_buffer_access_behavior.storage_buffer
KHR-GL44.robust_buffer_access_behavior.uniform_buffer
KHR-GL44.shader_storage_buffer_object.basic-basic
KHR-GL44.shader_storage_buffer_object.basic-basic-cs
KHR-GL44.shader_storage_buffer_object.basic-max
Expand Down
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3767,11 +3767,6 @@ KHR-GL45.compute_shader.api-indirect
KHR-GL45.compute_shader.api-program
KHR-GL45.compute_shader.glsl-compile-time-errors
KHR-GL45.compute_shader.glsl-link-time-errors
KHR-GL45.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GL45.robust_buffer_access_behavior.texel_fetch
KHR-GL45.robust_buffer_access_behavior.image_load_store
KHR-GL45.robust_buffer_access_behavior.storage_buffer
KHR-GL45.robust_buffer_access_behavior.uniform_buffer
KHR-GL45.shader_storage_buffer_object.basic-basic
KHR-GL45.shader_storage_buffer_object.basic-basic-cs
KHR-GL45.shader_storage_buffer_object.basic-max
Expand Down
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3767,11 +3767,6 @@ KHR-GL46.compute_shader.api-indirect
KHR-GL46.compute_shader.api-program
KHR-GL46.compute_shader.glsl-compile-time-errors
KHR-GL46.compute_shader.glsl-link-time-errors
KHR-GL46.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GL46.robust_buffer_access_behavior.texel_fetch
KHR-GL46.robust_buffer_access_behavior.image_load_store
KHR-GL46.robust_buffer_access_behavior.storage_buffer
KHR-GL46.robust_buffer_access_behavior.uniform_buffer
KHR-GL46.shader_storage_buffer_object.basic-basic
KHR-GL46.shader_storage_buffer_object.basic-basic-cs
KHR-GL46.shader_storage_buffer_object.basic-max
Expand Down
5 changes: 5 additions & 0 deletions external/openglcts/data/mustpass/gl/khronos_mustpass_noctx/4.6.0.x/gl43-khr-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ KHR-NoContext.gl43.khr_debug.groups
KHR-NoContext.gl43.khr_debug.api_errors_debug
KHR-NoContext.gl43.khr_debug.labels_debug
KHR-NoContext.gl43.khr_debug.synchronous_calls
KHR-NoContext.gl43.robust_buffer_access_behavior.vertex_buffer_objects
KHR-NoContext.gl43.robust_buffer_access_behavior.texel_fetch
KHR-NoContext.gl43.robust_buffer_access_behavior.image_load_store
KHR-NoContext.gl43.robust_buffer_access_behavior.storage_buffer
KHR-NoContext.gl43.robust_buffer_access_behavior.uniform_buffer
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,3 @@ KHR-GLES32.core.draw_buffers_indexed.set_get
KHR-GLES32.core.draw_buffers_indexed.color_masks
KHR-GLES32.core.draw_buffers_indexed.blending
KHR-GLES32.core.draw_buffers_indexed.negative
KHR-GLES32.robust.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GLES32.robust.robust_buffer_access_behavior.texel_fetch
KHR-GLES32.robust.robust_buffer_access_behavior.image_load_store
KHR-GLES32.robust.robust_buffer_access_behavior.storage_buffer
KHR-GLES32.robust.robust_buffer_access_behavior.uniform_buffer
2 changes: 0 additions & 2 deletions ...rnal/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-test-issues.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
#VK-GL-CTS 354
KHR-GLES32.robust.*
2 changes: 0 additions & 2 deletions ...rnal/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-test-issues.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
#VK-GL-CTS 354i
KHR-GLES32.robust.*
5 changes: 0 additions & 5 deletions external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,8 +1009,3 @@ KHR-GLES32.core.constant_expressions.array_normalize_vec4_tess_control
KHR-GLES32.core.constant_expressions.array_normalize_vec4_tess_eval
KHR-GLES32.core.separable_programs_tf.tessellation_active
KHR-GLES32.core.separable_programs_tf.geometry_active
KHR-GLES32.robust.robust_buffer_access_behavior.vertex_buffer_objects
KHR-GLES32.robust.robust_buffer_access_behavior.texel_fetch
KHR-GLES32.robust.robust_buffer_access_behavior.image_load_store
KHR-GLES32.robust.robust_buffer_access_behavior.storage_buffer
KHR-GLES32.robust.robust_buffer_access_behavior.uniform_buffer
5 changes: 5 additions & 0 deletions external/openglcts/data/mustpass/gles/khronos_mustpass_noctx/3.2.4.x/gles32-khr-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ KHR-NoContext.es32.context_flags.no_flags_set_case
KHR-NoContext.es32.context_flags.debug_flag_set_case
KHR-NoContext.es32.context_flags.robust_flag_set_case
KHR-NoContext.es32.context_flags.all_flags_set_case
KHR-NoContext.es32.robust_buffer_access_behavior.vertex_buffer_objects
KHR-NoContext.es32.robust_buffer_access_behavior.texel_fetch
KHR-NoContext.es32.robust_buffer_access_behavior.image_load_store
KHR-NoContext.es32.robust_buffer_access_behavior.storage_buffer
KHR-NoContext.es32.robust_buffer_access_behavior.uniform_buffer
5 changes: 5 additions & 0 deletions external/openglcts/data/mustpass/gles/khronos_mustpass_noctx/master/gles32-khr-master.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ KHR-NoContext.es32.context_flags.no_flags_set_case
KHR-NoContext.es32.context_flags.debug_flag_set_case
KHR-NoContext.es32.context_flags.robust_flag_set_case
KHR-NoContext.es32.context_flags.all_flags_set_case
KHR-NoContext.es32.robust_buffer_access_behavior.vertex_buffer_objects
KHR-NoContext.es32.robust_buffer_access_behavior.texel_fetch
KHR-NoContext.es32.robust_buffer_access_behavior.image_load_store
KHR-NoContext.es32.robust_buffer_access_behavior.storage_buffer
KHR-NoContext.es32.robust_buffer_access_behavior.uniform_buffer
4 changes: 4 additions & 0 deletions external/openglcts/modules/common/glcNoDefaultContextPackage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "glcKHRDebugTests.hpp"
#include "glcMultipleContextsTests.hpp"
#include "glcNoErrorTests.hpp"
#include "es32cRobustBufferAccessBehaviorTests.hpp"
#include "glcRobustBufferAccessBehaviorTests.hpp"
#include "glcRobustnessTests.hpp"
#include "gluRenderContext.hpp"

Expand Down Expand Up @@ -96,6 +98,7 @@ void NoDefaultContextPackage::init(void)

tcu::TestCaseGroup* gl43Group = new tcu::TestCaseGroup(getTestContext(), "gl43", "");
gl43Group->addChild(new glcts::KHRDebugTests(getTestContext(), glu::ApiType::core(4, 3)));
gl43Group->addChild(new deqp::RobustBufferAccessBehaviorTests(getTestContext(), glu::ApiType::core(4, 3)));
addChild(gl43Group);

tcu::TestCaseGroup* gl45Group = new tcu::TestCaseGroup(getTestContext(), "gl45", "");
Expand All @@ -110,6 +113,7 @@ void NoDefaultContextPackage::init(void)
tcu::TestCaseGroup* es32Group = new tcu::TestCaseGroup(getTestContext(), "es32", "");
es32Group->addChild(new glcts::RobustnessTests(getTestContext(), glu::ApiType::es(3, 2)));
es32Group->addChild(new glcts::ContextFlagsTests(getTestContext(), glu::ApiType::es(3, 2)));
es32Group->addChild(new es32cts::RobustBufferAccessBehaviorTests(getTestContext(), glu::ApiType::es(3, 2)));
addChild(es32Group);
}

Expand Down
Loading

0 comments on commit dfc5773

Please sign in to comment.