waffle: Rename WAFFLE_GL* -> WAFFLE_OPENGL*

WAFFLE_GL_API   -> WAFFLE_OPENGL_API
WAFFLE_GL       -> WAFFLE_OPENGL
WAFFLE_GLES1    -> WAFFLE_OPENGL_ES1
WAFFLE_GLES2    -> WAFFLE_OPENGL_ES2

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

8 files changed, 42 insertions, 36 deletions

diff --git a/examples/gl_basic.c b/examples/gl_basic.c
index b37499f..e2f764d 100644
--- a/examples/gl_basic.c
+++ b/examples/gl_basic.c
@@ -129,9 +129,9 @@ static const struct enum_map platform_map[] = {
 };
 
 static const struct enum_map gl_api_map[] = {
-    {WAFFLE_GL,                 "gl"            },
-    {WAFFLE_GLES1,              "gles1"         },
-    {WAFFLE_GLES2,              "gles2"         },
+    {WAFFLE_OPENGL,             "gl"            },
+    {WAFFLE_OPENGL_ES1,         "gles1"         },
+    {WAFFLE_OPENGL_ES2,         "gles2"         },
     {0,                         0               },
 };
 
@@ -215,7 +215,7 @@ make_waffle_attrib_list(int platform, int gl_api)
 
     result[0] = WAFFLE_PLATFORM;
     result[1] = platform;
-    result[2] = WAFFLE_GL_API;
+    result[2] = WAFFLE_OPENGL_API;
     result[3] = gl_api;
     result[4] = 0;
 
diff --git a/include/waffle/waffle_enum.h b/include/waffle/waffle_enum.h
index 44850de..2ed04d3 100644
--- a/include/waffle/waffle_enum.h
+++ b/include/waffle/waffle_enum.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /// @brief Convert a waffle_enum to a string.
 ///
-/// For example, convert @c WAFFLE_GL to @c "WAFFLE_GL" .
+/// For example, convert @c WAFFLE_OPENGL to @c "WAFFLE_OPENGL" .
 ///
 /// @return null if enum is invalid.
 WAFFLE_API const char*
@@ -48,10 +48,10 @@ enum waffle_enum {
         WAFFLE_PLATFORM_WAYLAND         = 0x0014,
         WAFFLE_PLATFORM_X11_EGL         = 0x0015,
 
-    WAFFLE_GL_API                       = 0x0100,
-        WAFFLE_GL                       = 0x0101,
-        WAFFLE_GLES1                    = 0x0102,
-        WAFFLE_GLES2                    = 0x0103,
+    WAFFLE_OPENGL_API                   = 0x0100,
+        WAFFLE_OPENGL                   = 0x0101,
+        WAFFLE_OPENGL_ES1               = 0x0102,
+        WAFFLE_OPENGL_ES2               = 0x0103,
 
     /// @}
     /// @defgroup enums for waffle_config_choose()
diff --git a/include/waffle/waffle_init.h b/include/waffle/waffle_init.h
index a45155b..015acf9 100644
--- a/include/waffle/waffle_init.h
+++ b/include/waffle/waffle_init.h
@@ -48,7 +48,7 @@ extern "C" {
 /// @par Required Attributes
 ///
 ///     - WAFFLE_PLATFORM
-///     - WAFFLE_GL_API
+///     - WAFFLE_OPENGL_API
 ///
 /// @par Example: Invalid Attribute List
 ///
@@ -57,8 +57,8 @@ extern "C" {
 ///     WAFFLE_INCOMPATIBLE_ATTRIBUTES error.
 ///         @code
 ///             {
-///               WAFFLE_PLATFORM, WAFFLE_PLATFORM_ANDROID,
-///               WAFFLE_GL_API,   WAFFLE_GL,
+///               WAFFLE_PLATFORM,      WAFFLE_PLATFORM_ANDROID,
+///               WAFFLE_OPENGL_API,    WAFFLE_OPENGL,
 ///               0,
 ///             }
 ///         @endcode
diff --git a/src/waffle/api/waffle_init.c b/src/waffle/api/waffle_init.c
index d266a41..adc57cd 100644
--- a/src/waffle/api/waffle_init.c
+++ b/src/waffle/api/waffle_init.c
@@ -63,17 +63,17 @@ waffle_init_parse_attrib_list(
                 }
 
                 break;
-            case WAFFLE_GL_API:
+            case WAFFLE_OPENGL_API:
                 switch (value) {
-                    case WAFFLE_GL:
-                    case WAFFLE_GLES1:
-                    case WAFFLE_GLES2:
+                    case WAFFLE_OPENGL:
+                    case WAFFLE_OPENGL_ES1:
+                    case WAFFLE_OPENGL_ES2:
                         found_gl_api = true;
                         *gl_api = value;
                         break;
                     default:
                         wcore_errorf(WAFFLE_BAD_ATTRIBUTE,
-                                     "WAFFLE_GL_API has bad value 0x%x",
+                                     "WAFFLE_OPENGL_API has bad value 0x%x",
                                      value);
                         return false;
                 }
@@ -93,7 +93,7 @@ waffle_init_parse_attrib_list(
 
     if (!found_gl_api) {
         wcore_errorf(WAFFLE_BAD_ATTRIBUTE,
-                     "attribute list is missing WAFFLE_GL_API");
+                     "attribute list is missing WAFFLE_OPENGL_API");
         return false;
     }
 
diff --git a/src/waffle/egl/egl_no_native.c b/src/waffle/egl/egl_no_native.c
index 4c92b57..67f17cd 100644
--- a/src/waffle/egl/egl_no_native.c
+++ b/src/waffle/egl/egl_no_native.c
@@ -102,9 +102,15 @@ egl_choose_config(
     };
 
     switch (waffle_gl_api) {
-        case WAFFLE_GL:     attrib_list[renderable_index] = EGL_OPENGL_BIT;       break;
-        case WAFFLE_GLES1:  attrib_list[renderable_index] = EGL_OPENGL_ES_BIT;    break;
-        case WAFFLE_GLES2:  attrib_list[renderable_index] = EGL_OPENGL_ES2_BIT;   break;
+        case WAFFLE_OPENGL:
+            attrib_list[renderable_index] = EGL_OPENGL_BIT;
+            break;
+        case WAFFLE_OPENGL_ES1:
+            attrib_list[renderable_index] = EGL_OPENGL_ES_BIT;
+            break;
+        case WAFFLE_OPENGL_ES2:
+            attrib_list[renderable_index] = EGL_OPENGL_ES2_BIT;
+            break;
         default:
             wcore_error_internal("gl_api has bad value 0x%x", waffle_gl_api);
             goto end;
@@ -145,11 +151,11 @@ egl_bind_api(int32_t waffle_gl_api)
     bool ok = true;
 
     switch (waffle_gl_api) {
-        case WAFFLE_GL:
+        case WAFFLE_OPENGL:
             ok &= eglBindAPI(EGL_OPENGL_API);
             break;
-        case WAFFLE_GLES1:
-        case WAFFLE_GLES2:
+        case WAFFLE_OPENGL_ES1:
+        case WAFFLE_OPENGL_ES2:
             ok &= eglBindAPI(EGL_OPENGL_ES_API);
             break;
         default:
@@ -172,15 +178,15 @@ egl_create_context(
     EGLint attrib_list[3];
 
     switch (waffle_gl_api) {
-        case WAFFLE_GL:
+        case WAFFLE_OPENGL:
             attrib_list[0] = EGL_NONE;
             break;
-        case WAFFLE_GLES1:
+        case WAFFLE_OPENGL_ES1:
             attrib_list[0] = EGL_CONTEXT_CLIENT_VERSION;
             attrib_list[1] = 1;
             attrib_list[2] = EGL_NONE;
             break;
-        case WAFFLE_GLES2:
+        case WAFFLE_OPENGL_ES2:
             attrib_list[0] = EGL_CONTEXT_CLIENT_VERSION;
             attrib_list[1] = 2;
             attrib_list[2] = EGL_NONE;
diff --git a/src/waffle/x11_egl/xegl_platform.c b/src/waffle/x11_egl/xegl_platform.c
index a7f7a01..71fe747 100644
--- a/src/waffle/x11_egl/xegl_platform.c
+++ b/src/waffle/x11_egl/xegl_platform.c
@@ -61,9 +61,9 @@ xegl_platform_create(
     self->xegl->gl_api = gl_api;
 
     switch (gl_api) {
-        case WAFFLE_GL:     self->xegl->libgl_name = "libGL.so";        break;
-        case WAFFLE_GLES1:  self->xegl->libgl_name = "libGLESv1_CM.so"; break;
-        case WAFFLE_GLES2:  self->xegl->libgl_name = "libGLESv2.so";    break;
+        case WAFFLE_OPENGL:      self->xegl->libgl_name = "libGL.so";        break;
+        case WAFFLE_OPENGL_ES1:  self->xegl->libgl_name = "libGLESv1_CM.so"; break;
+        case WAFFLE_OPENGL_ES2:  self->xegl->libgl_name = "libGLESv2.so";    break;
         default:
             wcore_error_internal("gl_api has bad value 0x%x", gl_api);
             goto error;
diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index 6279862..46696ad 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -133,7 +133,7 @@ gl_basic(int32_t platform, int32_t gl_api)
 {
     const int32_t init_attrib_list[] = {
         WAFFLE_PLATFORM,        platform,
-        WAFFLE_GL_API,          gl_api,
+        WAFFLE_OPENGL_API,      gl_api,
         0,
     };
 
@@ -192,17 +192,17 @@ gl_basic(int32_t platform, int32_t gl_api)
 #ifdef WAFFLE_HAS_X11_EGL
 TEST(gl_basic, x11_egl_gl)
 {
-    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_GL);
+    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_OPENGL);
 }
 
 TEST(gl_basic, x11_egl_gles1)
 {
-    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_GLES1);
+    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_OPENGL_ES1);
 }
 
 TEST(gl_basic, x11_egl_gles2)
 {
-    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_GLES1);
+    gl_basic(WAFFLE_PLATFORM_X11_EGL, WAFFLE_OPENGL_ES2);
 }
 #endif
 
diff --git a/tests/unittests/waffle/core/wcore_config_attrs_unittest.c b/tests/unittests/waffle/core/wcore_config_attrs_unittest.c
index aee813a..aa8e16a 100644
--- a/tests/unittests/waffle/core/wcore_config_attrs_unittest.c
+++ b/tests/unittests/waffle/core/wcore_config_attrs_unittest.c
@@ -57,13 +57,13 @@ TEST(wcore_config_attrs, empty_attrib_list)
 TEST(wcore_config_attrs, bad_attr)
 {
     const int32_t attrib_list[] = {
-        WAFFLE_GL_API,  WAFFLE_GLES2,
+        WAFFLE_OPENGL_API,  WAFFLE_OPENGL_ES2,
         0,
     };
 
     ASSERT_TRUE(!wcore_config_attrs_parse(attrib_list, &actual_attrs));
     EXPECT_TRUE(wcore_error_get_code() == WAFFLE_BAD_ATTRIBUTE);
-    EXPECT_TRUE(strstr(wcore_error_get_message(), "WAFFLE_GL_API")
+    EXPECT_TRUE(strstr(wcore_error_get_message(), "WAFFLE_OPENGL_API")
                 || strstr(wcore_error_get_message(), "0x10"));
 }