introduce ALLEGRO_CFG_OPENGL_FIXED_FUNCTION config macro

Makes the legacy GL code parts a bit clearer.

Author: dos1

CMakeLists.txt

@@ -571,6 +571,7 @@ if(WANT_OPENGL)
         if(OPENGL_FOUND AND OPENGL_GLU_FOUND)
             set(SUPPORT_OPENGL 1)
             set(ALLEGRO_CFG_OPENGL 1)
+            set(ALLEGRO_CFG_OPENGL_FIXED_FUNCTION 1)
             # We assume that the OpenGL library is not very old.
             set(ALLEGRO_CFG_OPENGL_PROGRAMMABLE_PIPELINE 1)
             if(OPENGL_opengl_LIBRARY) # prefer GLVND if available
@@ -636,6 +637,7 @@ if(WANT_OPENGL)
             set(ALLEGRO_CFG_OPENGL 1)
             set(ALLEGRO_CFG_OPENGLES 1)
             set(ALLEGRO_CFG_OPENGLES1 1)
+            set(ALLEGRO_CFG_OPENGL_FIXED_FUNCTION 1)
             message("Using OpenGL ES 1.1")
             set(OPENGL_LIBRARIES ${OPENGLES1_LIBRARIES})
             include_directories(SYSTEM ${OPENGLES1_INCLUDE_DIR})

addons/primitives/prim_opengl.c

@@ -200,7 +200,7 @@ static void setup_state(const char* vtxs, const ALLEGRO_VERTEX_DECL* decl, ALLEG
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       if(decl) {
          ALLEGRO_VERTEX_ELEMENT* e;
          e = &decl->elements[ALLEGRO_PRIM_POSITION];
@@ -315,7 +315,7 @@ static void setup_state(const char* vtxs, const ALLEGRO_VERTEX_DECL* decl, ALLEG
 #endif
       }
       else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
          glMatrixMode(GL_TEXTURE);
          glLoadMatrixf(mat[0]);
          glMatrixMode(GL_MODELVIEW);
@@ -359,7 +359,7 @@ static void revert_state(ALLEGRO_BITMAP* texture)
 #endif
       }
       else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
          glDisable(GL_TEXTURE_2D);
          glMatrixMode(GL_TEXTURE);
          glLoadIdentity();
@@ -379,7 +379,7 @@ static void revert_state(ALLEGRO_BITMAP* texture)
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glDisableClientState(GL_COLOR_ARRAY);
       glDisableClientState(GL_VERTEX_ARRAY);
       glDisableClientState(GL_TEXTURE_COORD_ARRAY);

include/allegro5/platform/alplatf.h.cmake

@@ -21,6 +21,7 @@
 #cmakedefine ALLEGRO_CFG_OPENGLES1
 #cmakedefine ALLEGRO_CFG_OPENGLES2
 #cmakedefine ALLEGRO_CFG_OPENGLES3
+#cmakedefine ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
 #cmakedefine ALLEGRO_CFG_OPENGL_PROGRAMMABLE_PIPELINE
 #cmakedefine ALLEGRO_CFG_SHADER_GLSL
 #cmakedefine ALLEGRO_CFG_SHADER_HLSL

src/opengl/ogl_bitmap.c

@@ -183,7 +183,7 @@ char const *_al_gl_error_string(GLenum e)
       ERR(GL_INVALID_ENUM)
       ERR(GL_INVALID_VALUE)
       ERR(GL_INVALID_OPERATION)
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       ERR(GL_STACK_OVERFLOW)
       ERR(GL_STACK_UNDERFLOW)
 #endif
@@ -464,7 +464,7 @@ static bool ogl_upload_bitmap(ALLEGRO_BITMAP *bitmap)
          post_generate_mipmap = true;
       }
       else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
          glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
           e = glGetError();
           if (e) {

src/opengl/ogl_draw.c

@@ -134,7 +134,7 @@ static void vert_ptr_on(ALLEGRO_DISPLAY *display, int n, GLint t, int stride, vo
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glEnableClientState(GL_VERTEX_ARRAY);
       glVertexPointer(n, t, stride, v);
 #endif
@@ -151,7 +151,7 @@ static void vert_ptr_off(ALLEGRO_DISPLAY *display)
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glDisableClientState(GL_VERTEX_ARRAY);
 #endif
    }
@@ -168,7 +168,7 @@ static void color_ptr_on(ALLEGRO_DISPLAY *display, int n, GLint t, int stride, v
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glEnableClientState(GL_COLOR_ARRAY);
       glColorPointer(n, t, stride, v);
 #endif
@@ -185,7 +185,7 @@ static void color_ptr_off(ALLEGRO_DISPLAY *display)
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glDisableClientState(GL_COLOR_ARRAY);
 #endif
    }
@@ -202,7 +202,7 @@ static void tex_ptr_on(ALLEGRO_DISPLAY *display, int n, GLint t, int stride, voi
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glEnableClientState(GL_TEXTURE_COORD_ARRAY);
       glTexCoordPointer(n, t, stride, v);
 #endif
@@ -219,7 +219,7 @@ static void tex_ptr_off(ALLEGRO_DISPLAY *display)
 #endif
    }
    else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #endif
    }
@@ -409,7 +409,7 @@ static void ogl_flush_vertex_cache(ALLEGRO_DISPLAY *disp)
       color_ptr_on(disp, 4, GL_FLOAT, sizeof(ALLEGRO_OGL_BITMAP_VERTEX),
          (char*)(disp->vertex_cache) + offsetof(ALLEGRO_OGL_BITMAP_VERTEX, r));
 
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       if (!(disp->flags & ALLEGRO_PROGRAMMABLE_PIPELINE))
          glDisableClientState(GL_NORMAL_ARRAY);
 #endif
@@ -475,7 +475,7 @@ static void ogl_update_transformation(ALLEGRO_DISPLAY* disp,
       }
 #endif
    } else {
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
       glMatrixMode(GL_PROJECTION);
       glLoadMatrixf((float *)target->proj_transform.m);
       glMatrixMode(GL_MODELVIEW);

src/opengl/ogl_render_state.c

@@ -25,7 +25,7 @@ void _al_ogl_update_render_state(ALLEGRO_DISPLAY *display)
     * avoid so many redundant OpenGL calls.
     */
 
-#ifndef ALLEGRO_CFG_OPENGLES2
+#ifdef ALLEGRO_CFG_OPENGL_FIXED_FUNCTION
    if (!(display->flags & ALLEGRO_PROGRAMMABLE_PIPELINE)) {
       if (r->alpha_test == 0)
          glDisable(GL_ALPHA_TEST);