Changeset 1690
- Timestamp:
- Aug 2, 2012, 11:23:09 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/easymesh/shiny.lolfx
r1687 r1690 1 1 2 2 -- GLSL.Vert -- 3 #if defined GL_ES4 #version 1005 #else6 3 #version 120 7 #endif8 4 9 5 attribute vec3 in_Vertex; … … 14 10 uniform mat4 in_Proj; 15 11 uniform mat3 in_NormalMat; 16 uniform vec3 in_LightDir = vec3(0.3, 0.3, 0.7); 12 // FIXME: the light direction should be passed in the code 13 vec3 in_LightDir = vec3(0.3, 0.3, 0.7); 17 14 uniform float in_Damage; 18 15 … … 54 51 55 52 -- GLSL.Frag -- 56 #if defined GL_ES57 #version 10058 #else59 53 #version 120 60 #endif61 54 62 55 #if defined GL_ES -
trunk/src/gpu/shader.cpp
r1513 r1690 217 217 Log::Error("shader source:\n%s\n", buf); 218 218 } 219 else if (len > 1 )219 else if (len > 16) 220 220 { 221 221 Log::Debug("compile log for vertex shader: %s", errbuf); … … 261 261 Log::Error("shader source:\n%s\n", buf); 262 262 } 263 else if (len > 1 )263 else if (len > 16) 264 264 { 265 265 Log::Debug("compile log for fragment shader: %s", errbuf); … … 309 309 Log::Error("failed to link program: %s", errbuf); 310 310 } 311 else if (len > 1 )311 else if (len > 16) 312 312 { 313 313 Log::Debug("link log for program: %s", errbuf); … … 611 611 if (!version) 612 612 { 613 #if defined HAVE_GLES_2X 614 /* GLES 2.x supports #version 100, that's all. */ 615 return 100; 616 #else 613 617 char buf[4096]; 614 618 GLsizei len; … … 644 648 645 649 glDeleteShader(id); 650 #endif 646 651 } 647 652 #endif … … 651 656 652 657 /* Simple shader source patching for old GLSL versions. 653 * If supported version is 1.30, do nothing.654 * If supported version is 1.20:655 * - replace "#version 130" with "#version 120"656 658 */ 657 659 void ShaderData::Patch(char *dst, char const *vert, char const *frag) … … 667 669 if (parser) 668 670 ver_shader = atoi(parser + strlen("#version")); 671 672 /* This is GL ES, we only know version 100. */ 673 if (ver_shader > 100 && ver_driver == 100) 674 { 675 /* FIXME: this isn't elegant but honestly, we don't care, this 676 * whole file is going to die soon. */ 677 char *p = strstr(dst, "#version"); 678 if (p) 679 { 680 p += 8; 681 while (*p == ' ') 682 p++; 683 if (p[0] == '1' && p[1] && p[2]) 684 p[1] = p[2] = '0'; 685 } 686 } 669 687 670 688 if (ver_shader > 120 && ver_driver <= 120) -
trunk/tutorial/11_fractal.lolfx
r1518 r1690 3 3 #version 120 4 4 5 #if defined HAVE_GLES_2X5 #if defined GL_ES 6 6 precision highp float; 7 7 #endif … … 54 54 #version 120 55 55 56 #if defined HAVE_GLES_2X56 #if defined GL_ES 57 57 precision highp float; 58 58 #endif
Note: See TracChangeset
for help on using the changeset viewer.