[gtk+] vulkan: No need to redefine gl_PerVertex



commit e1572e003ab9de0e9fce503f967b5c4f5be36b9e
Author: Benjamin Otte <otte redhat com>
Date:   Tue Oct 24 01:28:46 2017 +0200

    vulkan: No need to redefine gl_PerVertex
    
    The compiler has those predefined, so use them.

 gsk/resources/vulkan/blendmode.vert         |    4 ----
 gsk/resources/vulkan/blendmode.vert.spv     |  Bin 4124 -> 4260 bytes
 gsk/resources/vulkan/blur.vert              |    4 ----
 gsk/resources/vulkan/blur.vert.spv          |  Bin 3440 -> 3576 bytes
 gsk/resources/vulkan/border.vert            |    4 ----
 gsk/resources/vulkan/border.vert.spv        |  Bin 7428 -> 7548 bytes
 gsk/resources/vulkan/color-matrix.vert      |    4 ----
 gsk/resources/vulkan/color-matrix.vert.spv  |  Bin 3488 -> 3624 bytes
 gsk/resources/vulkan/color.vert             |    4 ----
 gsk/resources/vulkan/color.vert.spv         |  Bin 2148 -> 2284 bytes
 gsk/resources/vulkan/crossfade.vert         |    4 ----
 gsk/resources/vulkan/crossfade.vert.spv     |  Bin 4108 -> 4244 bytes
 gsk/resources/vulkan/inset-shadow.vert      |    4 ----
 gsk/resources/vulkan/inset-shadow.vert.spv  |  Bin 3012 -> 3148 bytes
 gsk/resources/vulkan/linear.vert            |    4 ----
 gsk/resources/vulkan/linear.vert.spv        |  Bin 6212 -> 6332 bytes
 gsk/resources/vulkan/mask.vert              |    4 ----
 gsk/resources/vulkan/mask.vert.spv          |  Bin 3284 -> 3420 bytes
 gsk/resources/vulkan/outset-shadow.vert     |    4 ----
 gsk/resources/vulkan/outset-shadow.vert.spv |  Bin 3804 -> 3940 bytes
 gsk/resources/vulkan/texture.vert           |    4 ----
 gsk/resources/vulkan/texture.vert.spv       |  Bin 3136 -> 3272 bytes
 22 files changed, 0 insertions(+), 44 deletions(-)
---
diff --git a/gsk/resources/vulkan/blendmode.vert b/gsk/resources/vulkan/blendmode.vert
index 35b8356..6670475 100644
--- a/gsk/resources/vulkan/blendmode.vert
+++ b/gsk/resources/vulkan/blendmode.vert
@@ -12,10 +12,6 @@ layout(location = 1) out vec2 outStartTexCoord;
 layout(location = 2) out vec2 outEndTexCoord;
 layout(location = 3) flat out uint outBlendMode;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/blendmode.vert.spv b/gsk/resources/vulkan/blendmode.vert.spv
index 614f7cf..2a8e939 100644
Binary files a/gsk/resources/vulkan/blendmode.vert.spv and b/gsk/resources/vulkan/blendmode.vert.spv differ
diff --git a/gsk/resources/vulkan/blur.vert b/gsk/resources/vulkan/blur.vert
index 4a5a138..10dccf7 100644
--- a/gsk/resources/vulkan/blur.vert
+++ b/gsk/resources/vulkan/blur.vert
@@ -12,10 +12,6 @@ layout(location = 1) out flat vec2 outSize;
 layout(location = 2) out vec2 outTexCoord;
 layout(location = 3) out flat float outRadius;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/blur.vert.spv b/gsk/resources/vulkan/blur.vert.spv
index f83b77a..f13264f 100644
Binary files a/gsk/resources/vulkan/blur.vert.spv and b/gsk/resources/vulkan/blur.vert.spv differ
diff --git a/gsk/resources/vulkan/border.vert b/gsk/resources/vulkan/border.vert
index b37ea9e..c712796 100644
--- a/gsk/resources/vulkan/border.vert
+++ b/gsk/resources/vulkan/border.vert
@@ -15,10 +15,6 @@ layout(location = 3) out flat vec4 outCornerWidths;
 layout(location = 4) out flat vec4 outCornerHeights;
 layout(location = 5) out flat vec4 outBorderWidths;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/border.vert.spv b/gsk/resources/vulkan/border.vert.spv
index dfa95f1..5cd6c74 100644
Binary files a/gsk/resources/vulkan/border.vert.spv and b/gsk/resources/vulkan/border.vert.spv differ
diff --git a/gsk/resources/vulkan/color-matrix.vert b/gsk/resources/vulkan/color-matrix.vert
index eb3f4fa..f264d10 100644
--- a/gsk/resources/vulkan/color-matrix.vert
+++ b/gsk/resources/vulkan/color-matrix.vert
@@ -12,10 +12,6 @@ layout(location = 1) out vec2 outTexCoord;
 layout(location = 2) out flat mat4 outColorMatrix;
 layout(location = 6) out flat vec4 outColorOffset;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/color-matrix.vert.spv b/gsk/resources/vulkan/color-matrix.vert.spv
index 89176d4..640ea05 100644
Binary files a/gsk/resources/vulkan/color-matrix.vert.spv and b/gsk/resources/vulkan/color-matrix.vert.spv 
differ
diff --git a/gsk/resources/vulkan/color.vert b/gsk/resources/vulkan/color.vert
index ce85ea7..1e1618a 100644
--- a/gsk/resources/vulkan/color.vert
+++ b/gsk/resources/vulkan/color.vert
@@ -8,10 +8,6 @@ layout(location = 1) in vec4 inColor;
 layout(location = 0) out vec2 outPos;
 layout(location = 1) out flat vec4 outColor;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/color.vert.spv b/gsk/resources/vulkan/color.vert.spv
index 4a0b396..cc12e4c 100644
Binary files a/gsk/resources/vulkan/color.vert.spv and b/gsk/resources/vulkan/color.vert.spv differ
diff --git a/gsk/resources/vulkan/crossfade.vert b/gsk/resources/vulkan/crossfade.vert
index 53cb15d..837f008 100644
--- a/gsk/resources/vulkan/crossfade.vert
+++ b/gsk/resources/vulkan/crossfade.vert
@@ -12,10 +12,6 @@ layout(location = 1) out vec2 outStartTexCoord;
 layout(location = 2) out vec2 outEndTexCoord;
 layout(location = 3) out float outProgress;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/crossfade.vert.spv b/gsk/resources/vulkan/crossfade.vert.spv
index c062edb..5df7bea 100644
Binary files a/gsk/resources/vulkan/crossfade.vert.spv and b/gsk/resources/vulkan/crossfade.vert.spv differ
diff --git a/gsk/resources/vulkan/inset-shadow.vert b/gsk/resources/vulkan/inset-shadow.vert
index 7b76e53..5fd8623 100644
--- a/gsk/resources/vulkan/inset-shadow.vert
+++ b/gsk/resources/vulkan/inset-shadow.vert
@@ -18,10 +18,6 @@ layout(location = 4) out flat vec4 outColor;
 layout(location = 5) out flat vec2 outOffset;
 layout(location = 6) out flat float outSpread;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/inset-shadow.vert.spv b/gsk/resources/vulkan/inset-shadow.vert.spv
index ce620f2..8f1d191 100644
Binary files a/gsk/resources/vulkan/inset-shadow.vert.spv and b/gsk/resources/vulkan/inset-shadow.vert.spv 
differ
diff --git a/gsk/resources/vulkan/linear.vert b/gsk/resources/vulkan/linear.vert
index f9fd57c..7453c0d 100644
--- a/gsk/resources/vulkan/linear.vert
+++ b/gsk/resources/vulkan/linear.vert
@@ -29,10 +29,6 @@ layout(location = 2) out flat int outRepeating;
 layout(location = 3) out flat int outStopCount;
 layout(location = 4) out flat ColorStop outStops[8];
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/linear.vert.spv b/gsk/resources/vulkan/linear.vert.spv
index bcc3fcf..ef42692 100644
Binary files a/gsk/resources/vulkan/linear.vert.spv and b/gsk/resources/vulkan/linear.vert.spv differ
diff --git a/gsk/resources/vulkan/mask.vert b/gsk/resources/vulkan/mask.vert
index f4bd9c1..03f0329 100644
--- a/gsk/resources/vulkan/mask.vert
+++ b/gsk/resources/vulkan/mask.vert
@@ -10,10 +10,6 @@ layout(location = 0) out vec2 outPos;
 layout(location = 1) out vec2 outTexCoord;
 layout(location = 2) out flat vec4 outColor;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/mask.vert.spv b/gsk/resources/vulkan/mask.vert.spv
index 22cd856..4c1bbfc 100644
Binary files a/gsk/resources/vulkan/mask.vert.spv and b/gsk/resources/vulkan/mask.vert.spv differ
diff --git a/gsk/resources/vulkan/outset-shadow.vert b/gsk/resources/vulkan/outset-shadow.vert
index 2b7c94c..6fdaf17 100644
--- a/gsk/resources/vulkan/outset-shadow.vert
+++ b/gsk/resources/vulkan/outset-shadow.vert
@@ -19,10 +19,6 @@ layout(location = 5) out flat vec2 outOffset;
 layout(location = 6) out flat float outSpread;
 layout(location = 7) out flat float outBlurRadius;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/outset-shadow.vert.spv b/gsk/resources/vulkan/outset-shadow.vert.spv
index 5f3db3d..260009f 100644
Binary files a/gsk/resources/vulkan/outset-shadow.vert.spv and b/gsk/resources/vulkan/outset-shadow.vert.spv 
differ
diff --git a/gsk/resources/vulkan/texture.vert b/gsk/resources/vulkan/texture.vert
index c9bbb40..e1e08bc 100644
--- a/gsk/resources/vulkan/texture.vert
+++ b/gsk/resources/vulkan/texture.vert
@@ -8,10 +8,6 @@ layout(location = 1) in vec4 inTexRect;
 layout(location = 0) out vec2 outPos;
 layout(location = 1) out vec2 outTexCoord;
 
-out gl_PerVertex {
-  vec4 gl_Position;
-};
-
 vec2 offsets[6] = { vec2(0.0, 0.0),
                     vec2(1.0, 0.0),
                     vec2(0.0, 1.0),
diff --git a/gsk/resources/vulkan/texture.vert.spv b/gsk/resources/vulkan/texture.vert.spv
index e814653..159680a 100644
Binary files a/gsk/resources/vulkan/texture.vert.spv and b/gsk/resources/vulkan/texture.vert.spv differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]