Skip to content
Snippets Groups Projects
Commit 6feef5d2 authored by James Hogan's avatar James Hogan Committed by Marge Bot
Browse files

OVR_multiview[2]: Use GLSL 3.3 (NVIDIA)


In order to allow the OVR_multiview tests to run on NVIDIA's proprietary
driver for sanity checking, bump all OVR_multiview shaders to GLSL 3.3.

Signed-off-by: default avatarJames Hogan <james@albanarts.com>
Acked-by: default avatarMarek Olšák <marek.olsak@amd.com>
Part-of: <!987>
parent f5a5b8b7
No related branches found
No related tags found
1 merge request!987OVR_multiview & OVR_multiview2: A bunch of new shader and C tests
Showing
with 26 additions and 26 deletions
// [config] // [config]
// expect_result: fail // expect_result: fail
// glsl_version: 1.30 // glsl_version: 3.30
// require_extensions: GL_OVR_multiview // require_extensions: GL_OVR_multiview
// check_link: false // check_link: false
// [end config] // [end config]
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// compile-time error results." // compile-time error results."
// //
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 3) in; layout(num_views = 3) in;
......
// [config] // [config]
// expect_result: pass // expect_result: pass
// glsl_version: 1.30 // glsl_version: 3.30
// require_extensions: GL_OVR_multiview // require_extensions: GL_OVR_multiview
// check_link: false // check_link: false
// [end config] // [end config]
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// compile-time error results." // compile-time error results."
// //
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 3) in; layout(num_views = 3) in;
......
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30; config.supports_gl_compat_version = 33;
config.khr_no_error_support = PIGLIT_HAS_ERRORS; config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END PIGLIT_GL_TEST_CONFIG_END
#define SHADER_VERSION_STR "#version 130\n" #define SHADER_VERSION_STR "#version 330\n"
static const char *vertex_shader_multiview = static const char *vertex_shader_multiview =
SHADER_VERSION_STR SHADER_VERSION_STR
......
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
# identical; otherwise a link-time error results. # identical; otherwise a link-time error results.
[require] [require]
GLSL >= 1.30 GLSL >= 3.30
GL_OVR_multiview GL_OVR_multiview
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 2) in; layout(num_views = 2) in;
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 2) in; layout(num_views = 2) in;
......
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
# identical; otherwise a link-time error results. # identical; otherwise a link-time error results.
[require] [require]
GLSL >= 1.30 GLSL >= 3.30
GL_OVR_multiview GL_OVR_multiview
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 2) in; layout(num_views = 2) in;
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 3) in; layout(num_views = 3) in;
......
[require] [require]
GLSL >= 1.30 GLSL >= 3.30
GL_OVR_multiview GL_OVR_multiview
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 2) in; layout(num_views = 2) in;
[vertex shader] [vertex shader]
#version 130 #version 330
void main() { void main() {
gl_Position = vec4(1.0); gl_Position = vec4(1.0);
......
[require] [require]
GLSL >= 1.30 GLSL >= 3.30
GL_OVR_multiview GL_OVR_multiview
[vertex shader] [vertex shader]
#version 130 #version 330
void main() { void main() {
gl_Position = vec4(1.0); gl_Position = vec4(1.0);
} }
[vertex shader] [vertex shader]
#version 130 #version 330
#extension GL_OVR_multiview : require #extension GL_OVR_multiview : require
layout(num_views = 2) in; layout(num_views = 2) in;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30; config.supports_gl_compat_version = 33;
config.khr_no_error_support = PIGLIT_NO_ERRORS; config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END PIGLIT_GL_TEST_CONFIG_END
...@@ -179,7 +179,7 @@ struct ShaderModeInfo shader_modes[] = { ...@@ -179,7 +179,7 @@ struct ShaderModeInfo shader_modes[] = {
{ 0 }, { 0 },
}; };
#define SHADER_VERSION_STR "#version 130\n" #define SHADER_VERSION_STR "#version 330\n"
static const char *vertex_shader_multiview = static const char *vertex_shader_multiview =
SHADER_VERSION_STR SHADER_VERSION_STR
......
// [config] // [config]
// expect_result: pass // expect_result: pass
// glsl_version: 1.30 // glsl_version: 3.30
// require_extensions: GL_OVR_multiview2 // require_extensions: GL_OVR_multiview2
// check_link: false // check_link: false
// [end config] // [end config]
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// is also implicitly enabled." // is also implicitly enabled."
// //
#version 130 #version 330
#extension GL_OVR_multiview2 : require #extension GL_OVR_multiview2 : require
layout(num_views = 2) in; layout(num_views = 2) in;
......
// [config] // [config]
// expect_result: pass // expect_result: pass
// glsl_version: 1.30 // glsl_version: 3.30
// require_extensions: GL_OVR_multiview2 // require_extensions: GL_OVR_multiview2
// check_link: false // check_link: false
// [end config] // [end config]
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
// is also implicitly enabled." // is also implicitly enabled."
// //
#version 130 #version 330
#extension GL_OVR_multiview2 : require #extension GL_OVR_multiview2 : require
out vec4 fragColor; out vec4 fragColor;
......
// [config] // [config]
// expect_result: pass // expect_result: pass
// glsl_version: 1.30 // glsl_version: 3.30
// require_extensions: GL_OVR_multiview2 // require_extensions: GL_OVR_multiview2
// check_link: false // check_link: false
// [end config] // [end config]
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// than gl_Position is statically dependent on gl_ViewID_OVR." // than gl_Position is statically dependent on gl_ViewID_OVR."
// //
#version 130 #version 330
#extension GL_OVR_multiview2 : require #extension GL_OVR_multiview2 : require
layout(num_views = 2) in; layout(num_views = 2) in;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment