Changeset 12091 for data/branches/Shader_HS18/programs/Example/GLSL150/SwizzleGP.glsl

Timestamp:

Nov 9, 2018, 1:06:05 PM (5 years ago)

Author:

wiesep

Message:

Updated programs and adjusted Material to work with GLSL>150

File:

• data/branches/Shader_HS18/programs/Example/GLSL150/SwizzleGP.glsl (modified) (1 diff)

data/branches/Shader_HS18/programs/Example/GLSL150/SwizzleGP.glsl

@@ -1 +1 @@
 #version 150
 
-#extension GL_EXT_geometry_shader4 : enable                                                                                                     
+uniform vec4 origColour;
+uniform vec4 cloneColour;
 
-uniform vec4 origColor;                                                                                                                                         
-uniform vec4 cloneColor;                                                                                                                                        
+out vec4 colour;
 
-void main(void)                                                                                                                                                         
-{                                                                                                                                                                                       
+layout(triangles) in;
+layout(line_strip, max_vertices = 6) out;
 
-        //increment variable                                                                                                                                    
-        int i;                                                                                                                                                                  
+void main()
+{
+    // Pass-through!
+    for (int i = 0; i < gl_in.length(); i++){
+        gl_Position = gl_in[i].gl_Position;
+        colour = origColour;
+        EmitVertex();
+    }
+    EndPrimitive();
 
-        /////////////////////////////////////////////////////////////                                                   
-        //This example has two parts                                                                                                                    
-        //      step a) draw the primitive pushed down the pipeline                                                                     
-        //               there are gl_Vertices # of vertices                                                                                    
-        //               put the vertex value into gl_Position                                                                                  
-        //               use EmitVertex => 'create' a new vertex                                                                                
-        //              use EndPrimitive to signal that you are done creating a primitive!                              
-        //      step b) create a new piece of geometry (I.E. WHY WE ARE USING A GEOMETRY SHADER!)       
-        //              I just do the same loop, but swizzle the x and y values                                                 
-        //      result => the line we want to draw, and the same line, but along the other axis         
-
-        //Pass-thru!                                                                                                                                                    
-        for(i=0; i< gl_VerticesIn; i++){                                                                                                                
-                gl_Position = gl_PositionIn[i];                                                                                                         
-                gl_FrontColor = origColor;                                                                                                                      
-                EmitVertex();                                                                                                                                           
-        }                                                                                                                                                                               
-        EndPrimitive();                                                                                                                                                 
-        //New piece of geometry!  We just swizzle the x and y terms                                                             
-        for(i=0; i< gl_VerticesIn; i++){                                                                                                                
-                gl_Position = gl_PositionIn[i];                                                                                                         
-                gl_Position.xy = gl_Position.yx;                                                                                                        
-                gl_FrontColor = cloneColor;                                                                                                                     
-                EmitVertex();                                                                                                                                           
-        }                                                                                                                                                                               
-        EndPrimitive();                                                                                                                                                 
-
+    // New piece of geometry!  We just swizzle the x and y terms.
+    for (int i = 0; i < gl_in.length(); i++){
+        gl_Position = gl_in[i].gl_Position;
+        gl_Position.xy = gl_Position.yx;
+        colour = cloneColour;
+        EmitVertex();
+    }
+    EndPrimitive();
 }