Changeset 818


Ignore:
Timestamp:
Aug 11, 2011, 5:58:29 PM (8 years ago)
Author:
sam
Message:

ps3: some compilation fixes to accomodate for recent debug additions.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/debug/quad.cpp

    r814 r818  
    4646    int initialised;
    4747    float time;
     48#if !defined __CELLOS_LV2__
    4849    GLuint array[NUM_ARRAYS];
     50#endif
    4951    GLuint buffer[NUM_BUFFERS];
    5052    Shader *shader[NUM_SHADERS];
     
    8082    if (!data->initialised && !IsDestroying())
    8183    {
     84#if !defined __CELLOS_LV2__
    8285        glGenVertexArrays(NUM_ARRAYS, data->array);
     86#endif
    8387        glGenBuffers(NUM_BUFFERS, data->buffer);
    8488        glGenTextures(NUM_TEXTURES, data->texture);
     
    108112    else if (data->initialised && IsDestroying())
    109113    {
     114#if !defined __CELLOS_LV2__
    110115        glDeleteVertexArrays(NUM_ARRAYS, data->array);
     116#endif
    111117        glDeleteBuffers(NUM_BUFFERS, data->buffer);
    112118        glDeleteTextures(NUM_TEXTURES, data->texture);
     
    216222     * Renders a static, coloured and tiled pattern.
    217223     */
     224#if !defined __CELLOS_LV2__
    218225    if (!data->shader[0])
    219226        data->shader[0] = Shader::Create(
     
    247254    Advance();
    248255    ResetState();
     256#endif
    249257
    250258    /*
     
    254262     * Renders a multicolored square with varying colors.
    255263     */
     264#if !defined __CELLOS_LV2__
    256265    if (!data->shader[1])
    257266        data->shader[1] = Shader::Create(
     
    289298        glVertex3f(data->aa.x, data->bb.y, 0.0f);
    290299    glEnd();
    291     glEnd();
    292300    glUseProgram(0);
    293301
    294302    Advance();
    295303    ResetState();
     304#endif
    296305
    297306    /*
     
    304313     * texture lookup is done in a shader.
    305314     */
     315#if !defined __CELLOS_LV2__
    306316    if (!data->shader[2])
    307317        data->shader[2] = Shader::Create(
     
    342352    ResetState();
    343353#endif
     354#endif
    344355
    345356    /*
     
    406417     * animated distorted checkerboard.
    407418     */
     419#if !defined __CELLOS_LV2__
    408420    if (!data->shader[3])
    409421        data->shader[3] = Shader::Create(
     
    452464    Advance();
    453465    ResetState();
     466#endif
    454467
    455468    /*
     
    459472     * animated distorted checkerboard.
    460473     */
     474#if !defined __CELLOS_LV2__
    461475    if (!data->shader[4])
    462476    {
     
    526540    Advance();
    527541    ResetState();
     542#endif
    528543
    529544    /*
     
    533548     * animated distorted checkerboard.
    534549     */
     550#if !defined __CELLOS_LV2__
    535551    if (!data->shader[5])
    536552    {
     
    600616    Advance();
    601617    ResetState();
     618#endif
    602619}
    603620
     
    616633
    617634    glBindBuffer(GL_ARRAY_BUFFER, 0);
     635#if !defined __CELLOS_LV2__
    618636    glUseProgram(0);
     637#endif
    619638}
    620639
  • trunk/src/shader/shader.cpp

    r799 r818  
    2525#include "lolgl.h"
    2626
     27using namespace std;
     28
    2729namespace lol
    2830{
     
    175177    static int version = 0;
    176178
     179#if !defined __CELLOS_LV2__
    177180    if (!version)
    178181    {
     
    211214        glDeleteShader(id);
    212215    }
     216#endif
    213217
    214218    return version;
Note: See TracChangeset for help on using the changeset viewer.