Changeset 819


Ignore:
Timestamp:
Aug 12, 2011, 1:27:58 AM (8 years ago)
Author:
sam
Message:

debug: make the GL test compile on Android.

File:
1 edited

Legend:

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

    r818 r819  
    8282    if (!data->initialised && !IsDestroying())
    8383    {
    84 #if !defined __CELLOS_LV2__
     84#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    8585        glGenVertexArrays(NUM_ARRAYS, data->array);
    8686#endif
     
    112112    else if (data->initialised && IsDestroying())
    113113    {
    114 #if !defined __CELLOS_LV2__
     114#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    115115        glDeleteVertexArrays(NUM_ARRAYS, data->array);
    116116#endif
     
    354354#endif
    355355
     356#if !defined ANDROID_NDK
    356357    /*
    357358     * Test #7: vertex buffer + per-vertex coloring
     
    378379    Advance();
    379380    ResetState();
     381#endif
    380382
    381383    /*
     
    385387     * animated distorted checkerboard.
    386388     */
     389#if !defined ANDROID_NDK
    387390    GLfloat const vertices2[] = { data->aa.x, data->bb.y, 0.0f,
    388391                                  data->bb.x, data->bb.y, 0.0f,
     
    410413    Advance();
    411414    ResetState();
     415#endif
    412416
    413417    /*
     
    417421     * animated distorted checkerboard.
    418422     */
    419 #if !defined __CELLOS_LV2__
     423#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    420424    if (!data->shader[3])
    421425        data->shader[3] = Shader::Create(
     
    472476     * animated distorted checkerboard.
    473477     */
    474 #if !defined __CELLOS_LV2__
     478#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    475479    if (!data->shader[4])
    476480    {
     
    548552     * animated distorted checkerboard.
    549553     */
    550 #if !defined __CELLOS_LV2__
     554#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    551555    if (!data->shader[5])
    552556    {
     
    622626{
    623627    /* Reset GL states to something reasonably safe */
     628#if defined HAVE_GLBEGIN || defined USE_GLEW
    624629    glMatrixMode(GL_PROJECTION);
    625630    glLoadIdentity();
    626631    glMatrixMode(GL_MODELVIEW);
    627632    glLoadIdentity();
     633#endif
    628634
    629635    glEnable(GL_TEXTURE_2D);
    630636    glBindTexture(GL_TEXTURE_2D, 0);
     637#if defined HAVE_GLBEGIN || defined USE_GLEW
    631638    glClientActiveTexture(GL_TEXTURE0);
     639#endif
    632640    glDisable(GL_TEXTURE_2D);
    633641
Note: See TracChangeset for help on using the changeset viewer.