From 2905ba82d2b6ab84475542069003b7004494e7ce Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 18 Jul 2019 18:58:57 +0200 Subject: [PATCH] [dxvk] Remove old meta vertex and geometry shaders --- src/dxvk/meson.build | 4 ---- src/dxvk/shaders/dxvk_copy_geom.geom | 22 ---------------------- src/dxvk/shaders/dxvk_copy_vert.vert | 8 -------- src/dxvk/shaders/dxvk_mipgen_geom.geom | 26 -------------------------- src/dxvk/shaders/dxvk_mipgen_vert.vert | 8 -------- 5 files changed, 68 deletions(-) delete mode 100644 src/dxvk/shaders/dxvk_copy_geom.geom delete mode 100644 src/dxvk/shaders/dxvk_copy_vert.vert delete mode 100644 src/dxvk/shaders/dxvk_mipgen_geom.geom delete mode 100644 src/dxvk/shaders/dxvk_mipgen_vert.vert diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index 98841c785..d24bfd058 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -12,8 +12,6 @@ dxvk_shaders = files([ 'shaders/dxvk_clear_image3d_u.comp', 'shaders/dxvk_clear_image3d_f.comp', - 'shaders/dxvk_copy_vert.vert', - 'shaders/dxvk_copy_geom.geom', 'shaders/dxvk_copy_color_1d.frag', 'shaders/dxvk_copy_color_2d.frag', 'shaders/dxvk_copy_color_ms.frag', @@ -28,8 +26,6 @@ dxvk_shaders = files([ 'shaders/dxvk_fullscreen_vert.vert', 'shaders/dxvk_fullscreen_layer_vert.vert', - 'shaders/dxvk_mipgen_vert.vert', - 'shaders/dxvk_mipgen_geom.geom', 'shaders/dxvk_mipgen_frag_1d.frag', 'shaders/dxvk_mipgen_frag_2d.frag', 'shaders/dxvk_mipgen_frag_3d.frag', diff --git a/src/dxvk/shaders/dxvk_copy_geom.geom b/src/dxvk/shaders/dxvk_copy_geom.geom deleted file mode 100644 index 456d935d6..000000000 --- a/src/dxvk/shaders/dxvk_copy_geom.geom +++ /dev/null @@ -1,22 +0,0 @@ -#version 450 - -layout(points) in; -layout(triangle_strip, max_vertices = 3) out; - -layout(location = 0) in int i_instance[1]; - -void main() { - gl_Position = vec4(-1.0f, 3.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - EmitVertex(); - - gl_Position = vec4(-1.0f, -1.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - EmitVertex(); - - gl_Position = vec4( 3.0f, -1.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - EmitVertex(); - - EndPrimitive(); -} \ No newline at end of file diff --git a/src/dxvk/shaders/dxvk_copy_vert.vert b/src/dxvk/shaders/dxvk_copy_vert.vert deleted file mode 100644 index 3009b809b..000000000 --- a/src/dxvk/shaders/dxvk_copy_vert.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 450 - -layout(location = 0) out int o_instance; - -void main() { - o_instance = gl_InstanceIndex; - gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f); -} \ No newline at end of file diff --git a/src/dxvk/shaders/dxvk_mipgen_geom.geom b/src/dxvk/shaders/dxvk_mipgen_geom.geom deleted file mode 100644 index d81f4b197..000000000 --- a/src/dxvk/shaders/dxvk_mipgen_geom.geom +++ /dev/null @@ -1,26 +0,0 @@ -#version 450 - -layout(points) in; -layout(triangle_strip, max_vertices = 3) out; - -layout(location = 0) in int i_instance[1]; -layout(location = 0) out vec3 o_pos; - -void main() { - gl_Position = vec4(-1.0f, 3.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - o_pos = vec3(0.0f, 2.0f, float(i_instance[0])); - EmitVertex(); - - gl_Position = vec4(-1.0f, -1.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - o_pos = vec3(0.0f, 0.0f, float(i_instance[0])); - EmitVertex(); - - gl_Position = vec4( 3.0f, -1.0f, 0.0f, 1.0f); - gl_Layer = i_instance[0]; - o_pos = vec3(2.0f, 0.0f, float(i_instance[0])); - EmitVertex(); - - EndPrimitive(); -} \ No newline at end of file diff --git a/src/dxvk/shaders/dxvk_mipgen_vert.vert b/src/dxvk/shaders/dxvk_mipgen_vert.vert deleted file mode 100644 index 3009b809b..000000000 --- a/src/dxvk/shaders/dxvk_mipgen_vert.vert +++ /dev/null @@ -1,8 +0,0 @@ -#version 450 - -layout(location = 0) out int o_instance; - -void main() { - o_instance = gl_InstanceIndex; - gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f); -} \ No newline at end of file