Changeset 771Tweet

Timestamp:

Jun 9, 2011, 1:55:52 AM (9 years ago)

Author:

sam

Message:

debug: more debug quad tests, 1.20 shaders.

Location:

trunk/src

Files:

• debugquad.cpp (modified) (8 diffs)
• video.cpp (modified) (4 diffs)

trunk/src/debugquad.cpp

@@ -29 +29 @@
  */
 
+#define NUM_SHADERS 3
+
 class DebugQuadData
 {
@@ -39 +41 @@
     float time;
     GLuint buflist[3];
-    Shader *shader;
+    Shader *shader[NUM_SHADERS];
     GLuint texlist[1];
     uint8_t image[1][32 * 32 * 4];
@@ -96 +98 @@
             "    gl_FragColor = vec4(1.0, 1.0, 1.0, 0.0);\n"
             "}\n";
-        data->shader = Shader::Create(vertexshader, fragmentshader);
+        data->shader[0] = Shader::Create(vertexshader, fragmentshader);
         glGenTextures(1, data->texlist);
 
@@ -116 +118 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
+        /* Quad #4: create texture in fragment shader */
+        data->shader[0] = Shader::Create(
+            "#version 120\n"
+            "void main()"
+            "{"
+            "    gl_Position = gl_Vertex;"
+            "}",
+
+            "#version 120\n"
+            "void main()"
+            "{"
+            "    float dx = mod(gl_FragCoord.x * gl_FragCoord.y, 2.0);"
+            "    float dy = mod(gl_FragCoord.x * 0.125, 1.0);"
+            "    float dz = mod(gl_FragCoord.y * 0.125, 1.0);"
+            "    gl_FragColor = vec4(dx, dy, dz, 1.0);"
+            "}");
+
+        /* Quad #5: pass color from vertex shader to fragment shader */
+        data->shader[1] = Shader::Create(
+            "#version 120\n"
+            "varying vec4 color;"
+            "void main()"
+            "{"
+            "    float r = gl_MultiTexCoord0.x;"
+            "    float g = gl_MultiTexCoord0.y;"
+            "    color = vec4(1.0 - r, 1.0 - g, r, 1.0);"
+            "    gl_Position = gl_Vertex;"
+            "}",
+
+            "#version 120\n"
+            "varying vec4 color;"
+            "void main()"
+            "{"
+            "    gl_FragColor = color;"
+            "}");
+
+        /* Quad #6: apply texture in fragment shader */
+        data->shader[2] = Shader::Create(
+            "void main()"
+            "{"
+            "    gl_TexCoord[0] = gl_MultiTexCoord0;"
+            "    gl_Position = gl_Vertex;"
+            "}",
+
+            "uniform sampler2D tex;"
+            "void main()"
+            "{"
+            "    gl_FragColor = texture2D(tex, gl_TexCoord[0].xy * 0.25);"
+            "}");
+
         data->initialised = 1;
     }
@@ -121 +173 @@
     {
         glDeleteBuffers(3, data->buflist);
-        Shader::Destroy(data->shader);
+        Shader::Destroy(data->shader[0]);
+        Shader::Destroy(data->shader[1]);
+        Shader::Destroy(data->shader[2]);
         glDeleteTextures(1, data->texlist);
 
@@ -185 +239 @@
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #else
-    data->shader->Bind();
+    data->shader[0]->Bind();
     GLuint attr_pos, attr_col, attr_tex;
-    attr_pos = data->shader->GetAttribLocation("in_Position");
-    attr_col = data->shader->GetAttribLocation("in_Color");
-    attr_tex = data->shader->GetAttribLocation("in_TexCoord");
+    attr_pos = data->shader[0]->GetAttribLocation("in_Position");
+    attr_col = data->shader[0]->GetAttribLocation("in_Color");
+    attr_tex = data->shader[0]->GetAttribLocation("in_TexCoord");
 
     glEnableVertexAttribArray(attr_pos);
@@ -240 +294 @@
 
     /* Quad #1: simple glBegin program */
-    glColor3f(1.0f, 1.0f, 1.0f);
+    glColor3f(0.8f, 0.5f, 0.2f);
     glBegin(GL_TRIANGLES);
         glVertex3f(data->aa.x, data->bb.y, 0.0f);
@@ -293 +347 @@
     Advance();
 
-    /* Quad #4: vertex buffer */
+    /* Quad #4: set color in fragment shader */
+    data->shader[0]->Bind();
+    glColor3f(0.0f, 1.0f, 1.0f);
+    glBegin(GL_TRIANGLES);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+        glVertex3f(data->bb.x, data->bb.y, 0.0f);
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+        glVertex3f(data->aa.x, data->aa.y, 0.0f);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+    glEnd();
+    glUseProgram(0);
+
+    Advance();
+
+    /* Quad #5: pass color from vertex shader to fragment shader */
+    data->shader[1]->Bind();
+    glColor3f(0.0f, 1.0f, 1.0f);
+    glBegin(GL_TRIANGLES);
+        glTexCoord2f(f1, f3);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+        glTexCoord2f(f3, f2);
+        glVertex3f(data->bb.x, data->bb.y, 0.0f);
+        glTexCoord2f(f2, f4);
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+
+        glTexCoord2f(f2, f4);
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+        glTexCoord2f(f4, f1);
+        glVertex3f(data->aa.x, data->aa.y, 0.0f);
+        glTexCoord2f(f1, f3);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+    glEnd();
+    glUseProgram(0);
+
+    Advance();
+
+    /* Quad #6: apply texture in fragment shader */
+    data->shader[2]->Bind();
+    glColor3f(0.0f, 1.0f, 1.0f);
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, data->texlist[0]);
+    glBegin(GL_TRIANGLES);
+        glTexCoord2f(f1, f3);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+        glTexCoord2f(f3, f2);
+        glVertex3f(data->bb.x, data->bb.y, 0.0f);
+        glTexCoord2f(f2, f4);
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+
+        glTexCoord2f(f2, f4);
+        glVertex3f(data->bb.x, data->aa.y, 0.0f);
+        glTexCoord2f(f4, f1);
+        glVertex3f(data->aa.x, data->aa.y, 0.0f);
+        glTexCoord2f(f1, f3);
+        glVertex3f(data->aa.x, data->bb.y, 0.0f);
+    glEnd();
+    glUseProgram(0);
+
+    Advance();
+
 }
 

trunk/src/video.cpp

@@ -35 +35 @@
 mat4 proj_matrix, view_matrix, model_matrix;
 
+#define OLD
+
 static char const *vertexshader =
+#if !defined OLD
     "#version 130\n"
+#endif
     "\n"
 #if defined HAVE_GLES_2X
@@ -42 +46 @@
     "attribute vec2 in_TexCoord;\n"
     "varying vec2 pass_TexCoord;\n"
-#else
+#elif !defined OLD
     "in vec3 in_Position;\n"
     "in vec2 in_TexCoord;\n"
@@ -54 +58 @@
     "void main()\n"
     "{\n"
+#if defined OLD
+    "    vec3 in_Position = gl_Vertex.xyz;\n"
+    "    vec2 in_TexCoord = gl_MultiTexCoord0.xy;\n"
+#endif
     "    gl_Position = proj_matrix * view_matrix * model_matrix"
     "                * vec4(in_Position, 1.0);\n"
@@ -65 +73 @@
 
 static char const *fragmentshader =
+#if !defined OLD
     "#version 130\n"
+#endif
     "\n"
     "uniform sampler2D in_Texture;\n"