- [gleam] Fix GLES2 compile errors

hbirchtree · Apr 4, 2020 · 87be9c9 · 87be9c9
1 parent e31d86a
commit 87be9c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.build.yml b/.build.yml
@@ -58,7 +58,7 @@ secrets:
   appveyor: 6ME8msH/BDLiEde9wCb9+GQRN4rcAzyu1Vx/wP5yHejedO3vPlrOXHiWqhjNqXrQ
 template_location: toolchain/cmake/Templates
 version:
-  hotfix: 3
+  hotfix: 4
   major: 4
   minor: 4
   patch: 12

diff --git a/src/coffee/graphics/apis/gleam/private/rhi/gleam_api_rhi.cpp b/src/coffee/graphics/apis/gleam/private/rhi/gleam_api_rhi.cpp
@@ -446,18 +446,22 @@ bool GLEAM_API::LoadAPI(
         CGL::Debug::UnsetDebugGroup();
 #endif
 
+#if GL_VERSION_VERIFY(0x300, 0x300)
     if(store->CURR_API != APILevel::GLES_2_0)
     {
         store->inst_data->queries.push_back(MkShared<GLEAM_TimeQuery>());
         store->inst_data->queries.at(0)->alloc();
     }
+#endif
 
+#if GL_VERSION_VERIFY(0x400, 0x310)
     if(GLEAM_FEATURES.draw_multi_indirect || store->CURR_API > APILevel::GL_4_3)
     {
         store->inst_data->indirectBuf =
             MkShared<GLEAM_IndirectBuffer>(RSCA::ReadOnly);
         store->inst_data->indirectBuf->alloc();
     }
+#endif
 
     ThreadSetName(0x8085, "OpenGL GPU-0");
 

diff --git a/src/coffee/graphics/apis/gleam/private/rhi/gleam_internal_types.h b/src/coffee/graphics/apis/gleam/private/rhi/gleam_internal_types.h
@@ -54,7 +54,9 @@ struct GLEAM_Instance_Data
     Vector<ShPtr<GLEAM_TimeQuery>> queries;
 #endif
 
+#if GL_VERSION_VERIFY(0x400, 0x310)
     ShPtr<GLEAM_IndirectBuffer> indirectBuf;
+#endif
 
     struct
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,9 @@ struct GLEAM_Instance_Data @@
         Vector<ShPtr<GLEAM_TimeQuery>> queries;
     #endif
+    #if GL_VERSION_VERIFY(0x400, 0x310)
         ShPtr<GLEAM_IndirectBuffer> indirectBuf;
+    #endif
         struct
         {
@@ Expand Down @@