Changeset 777 for trunk/src/video.cpp
 Timestamp:
 Jun 13, 2011, 9:35:52 PM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/video.cpp
r771 r777 38 38 39 39 static char const *vertexshader = 40 #if !defined OLD41 40 "#version 130\n" 42 #endif43 41 "\n" 44 42 #if defined HAVE_GLES_2X … … 46 44 "attribute vec2 in_TexCoord;\n" 47 45 "varying vec2 pass_TexCoord;\n" 48 #el if !defined OLD46 #else 49 47 "in vec3 in_Position;\n" 50 48 "in vec2 in_TexCoord;\n" 51 49 #endif 52 //"in vec3 in_Color;\n"53 //"out vec3 pass_Color;\n"54 50 "uniform mat4 proj_matrix;\n" 55 51 "uniform mat4 view_matrix;\n" … … 58 54 "void main()\n" 59 55 "{\n" 60 #if defined OLD61 " vec3 in_Position = gl_Vertex.xyz;\n"62 " vec2 in_TexCoord = gl_MultiTexCoord0.xy;\n"63 #endif64 56 " gl_Position = proj_matrix * view_matrix * model_matrix" 65 57 " * vec4(in_Position, 1.0);\n" 66 //" pass_Color = in_Color;\n"67 58 #if defined HAVE_GLES_2X 68 59 " pass_TexCoord = in_TexCoord;\n" … … 73 64 74 65 static char const *fragmentshader = 75 #if !defined OLD76 66 "#version 130\n" 77 #endif78 67 "\n" 79 68 "uniform sampler2D in_Texture;\n" 80 //"in vec3 pass_Color;\n"81 //"out vec4 out_Color;\n"82 69 #if defined HAVE_GLES_2X 83 70 "varying vec2 pass_TexCoord;\n"
Note: See TracChangeset
for help on using the changeset viewer.