Ignore:
Timestamp:
Jun 13, 2011, 9:35:52 PM (9 years ago)
Author:
sam
Message:

debug: convert debug quad shaders to GLSL 1.30.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/video.cpp

    r771 r777  
    3838
    3939static char const *vertexshader =
    40 #if !defined OLD
    4140    "#version 130\n"
    42 #endif
    4341    "\n"
    4442#if defined HAVE_GLES_2X
     
    4644    "attribute vec2 in_TexCoord;\n"
    4745    "varying vec2 pass_TexCoord;\n"
    48 #elif !defined OLD
     46#else
    4947    "in vec3 in_Position;\n"
    5048    "in vec2 in_TexCoord;\n"
    5149#endif
    52     //"in vec3 in_Color;\n"
    53     //"out vec3 pass_Color;\n"
    5450    "uniform mat4 proj_matrix;\n"
    5551    "uniform mat4 view_matrix;\n"
     
    5854    "void main()\n"
    5955    "{\n"
    60 #if defined OLD
    61     "    vec3 in_Position = gl_Vertex.xyz;\n"
    62     "    vec2 in_TexCoord = gl_MultiTexCoord0.xy;\n"
    63 #endif
    6456    "    gl_Position = proj_matrix * view_matrix * model_matrix"
    6557    "                * vec4(in_Position, 1.0);\n"
    66     //"    pass_Color = in_Color;\n"
    6758#if defined HAVE_GLES_2X
    6859    "    pass_TexCoord = in_TexCoord;\n"
     
    7364
    7465static char const *fragmentshader =
    75 #if !defined OLD
    7666    "#version 130\n"
    77 #endif
    7867    "\n"
    7968    "uniform sampler2D in_Texture;\n"
    80     //"in vec3 pass_Color;\n"
    81     //"out vec4 out_Color;\n"
    8269#if defined HAVE_GLES_2X
    8370    "varying vec2 pass_TexCoord;\n"
Note: See TracChangeset for help on using the changeset viewer.