Cubemap + WebGL float type fixes #7625
Conversation
| @@ -154,63 +154,63 @@ | |||
|
|
|||
| #if defined(GL_RGB32F_EXT) | |||
| #define DMGRAPHICS_TEXTURE_FORMAT_RGB32F (GL_RGB32F_EXT) | |||
| #elif defined(GL_RGB32F) && !defined (__EMSCRIPTEN__) | |||
| #elif defined(GL_RGB32F) | |||
There was a problem hiding this comment.
These are all core now on WebGL2
There was a problem hiding this comment.
And for WebGL1 we have the fallback to the "correct" float types for that context.
| #ifdef __EMSCRIPTEN__ | ||
| #define WEBGL1_WORKAROUND(fmt) \ | ||
| if (!context->m_IsGles3Version) \ | ||
| { \ | ||
| gl_internal_format = fmt; \ |
There was a problem hiding this comment.
For backwards compatability we need to do a workaround for WebGL1 here to use the "old" formats. We can't rely on compile time constants since they differ between the context versions..
| @@ -176,6 +176,7 @@ | |||
| #define glUnmapBufferARB glUnmapBufferOES | |||
| #define GL_ARRAY_BUFFER_ARB GL_ARRAY_BUFFER | |||
| #define GL_ELEMENT_ARRAY_BUFFER_ARB GL_ELEMENT_ARRAY_BUFFER | |||
| #define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F | |||
| glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); | ||
| CLEAR_GL_ERROR; |
There was a problem hiding this comment.
We can't guarantee that enabling seamless should work, for "most" platforms it's on by default if we use a GL3+ context so for debug builds to work if this flag DOESNT work we need to clear the errors. It's fine if we don't get seamless sampling for the platforms that don't support it since it's at least not worse than it is now where we don't have use this flag at all..
| #ifdef __EMSCRIPTEN__ | ||
| #define EMSCRIPTEN_ES2_BACKWARDS_COMPAT(var, value) ES2_ENUM_WORKAROUND(var, value) | ||
| #else | ||
| #define EMSCRIPTEN_ES2_BACKWARDS_COMPAT(var, value) | ||
| #endif | ||
| #ifdef __ANDROID__ | ||
| #define ANDROID_ES2_BACKWARDS_COMPAT(var, value) ES2_ENUM_WORKAROUND(var, value) | ||
| #else | ||
| #define ANDROID_ES2_BACKWARDS_COMPAT(var, value) | ||
| #endif |
There was a problem hiding this comment.
This is a bit awkward: webgl 2 requires other enums than webgl1 when creating certain textures, and android as well but different types depending on if we are using ES2 or ES3 context.. Since we use the same headers for both ES2 and ES3 for those platforms we need to be able to use different enums..
| #undef ANDROID_ES2_BACKWARDS_COMPAT | ||
| } | ||
|
|
||
| static void OpenGLSetTexture(HTexture texture, const TextureParams& params) |
There was a problem hiding this comment.
This looks like a "big" change, but it's just that I pulled out the type / format switch into a separate function
| #define DMGRAPHICS_TYPE_HALF_FLOAT (GL_HALF_FLOAT_OES) | ||
| #else | ||
|
|
||
| #ifdef GL_HALF_FLOAT | ||
| #define DMGRAPHICS_TYPE_HALF_FLOAT (GL_HALF_FLOAT) |
There was a problem hiding this comment.
For android this enum will always exist, but it's not the correct one to use if we run on a es3 context..
Jhonnyg
added
bug
| @@ -903,7 +904,7 @@ namespace dmGraphics | |||
|
|
|||
| selected_device = device; | |||
| selected_queue_family = queue_family; | |||
| break; | |||
| break; // Why do we break here? x_x | |||
There was a problem hiding this comment.
I guess because we're happy with the device we've found?
Are we not?
There was a problem hiding this comment.
Ah, lol I'm a dummy. Yes we are, I thought we didn't loop through all devices but I was probably drunk tired when I read the code
Fixed several issues with creating cubemap textures with float types. Creating cubemaps from scripts now also works correctly for all graphics adapters.