Changeset 818
- Timestamp:
- Aug 11, 2011, 5:58:29 PM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/debug/quad.cpp
r814 r818 46 46 int initialised; 47 47 float time; 48 #if !defined __CELLOS_LV2__ 48 49 GLuint array[NUM_ARRAYS]; 50 #endif 49 51 GLuint buffer[NUM_BUFFERS]; 50 52 Shader *shader[NUM_SHADERS]; … … 80 82 if (!data->initialised && !IsDestroying()) 81 83 { 84 #if !defined __CELLOS_LV2__ 82 85 glGenVertexArrays(NUM_ARRAYS, data->array); 86 #endif 83 87 glGenBuffers(NUM_BUFFERS, data->buffer); 84 88 glGenTextures(NUM_TEXTURES, data->texture); … … 108 112 else if (data->initialised && IsDestroying()) 109 113 { 114 #if !defined __CELLOS_LV2__ 110 115 glDeleteVertexArrays(NUM_ARRAYS, data->array); 116 #endif 111 117 glDeleteBuffers(NUM_BUFFERS, data->buffer); 112 118 glDeleteTextures(NUM_TEXTURES, data->texture); … … 216 222 * Renders a static, coloured and tiled pattern. 217 223 */ 224 #if !defined __CELLOS_LV2__ 218 225 if (!data->shader[0]) 219 226 data->shader[0] = Shader::Create( … … 247 254 Advance(); 248 255 ResetState(); 256 #endif 249 257 250 258 /* … … 254 262 * Renders a multicolored square with varying colors. 255 263 */ 264 #if !defined __CELLOS_LV2__ 256 265 if (!data->shader[1]) 257 266 data->shader[1] = Shader::Create( … … 289 298 glVertex3f(data->aa.x, data->bb.y, 0.0f); 290 299 glEnd(); 291 glEnd();292 300 glUseProgram(0); 293 301 294 302 Advance(); 295 303 ResetState(); 304 #endif 296 305 297 306 /* … … 304 313 * texture lookup is done in a shader. 305 314 */ 315 #if !defined __CELLOS_LV2__ 306 316 if (!data->shader[2]) 307 317 data->shader[2] = Shader::Create( … … 342 352 ResetState(); 343 353 #endif 354 #endif 344 355 345 356 /* … … 406 417 * animated distorted checkerboard. 407 418 */ 419 #if !defined __CELLOS_LV2__ 408 420 if (!data->shader[3]) 409 421 data->shader[3] = Shader::Create( … … 452 464 Advance(); 453 465 ResetState(); 466 #endif 454 467 455 468 /* … … 459 472 * animated distorted checkerboard. 460 473 */ 474 #if !defined __CELLOS_LV2__ 461 475 if (!data->shader[4]) 462 476 { … … 526 540 Advance(); 527 541 ResetState(); 542 #endif 528 543 529 544 /* … … 533 548 * animated distorted checkerboard. 534 549 */ 550 #if !defined __CELLOS_LV2__ 535 551 if (!data->shader[5]) 536 552 { … … 600 616 Advance(); 601 617 ResetState(); 618 #endif 602 619 } 603 620 … … 616 633 617 634 glBindBuffer(GL_ARRAY_BUFFER, 0); 635 #if !defined __CELLOS_LV2__ 618 636 glUseProgram(0); 637 #endif 619 638 } 620 639 -
trunk/src/shader/shader.cpp
r799 r818 25 25 #include "lolgl.h" 26 26 27 using namespace std; 28 27 29 namespace lol 28 30 { … … 175 177 static int version = 0; 176 178 179 #if !defined __CELLOS_LV2__ 177 180 if (!version) 178 181 { … … 211 214 glDeleteShader(id); 212 215 } 216 #endif 213 217 214 218 return version;
Note: See TracChangeset
for help on using the changeset viewer.