diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-02 08:18:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 08:18:42 +0100 |
| commit | 40e4c1f6abbe5569a3c2f91d48b9770c8e97ea0d (patch) | |
| tree | 12ba447a51df6e9a21d34df6ffdca8b1595e3f96 /drivers | |
| parent | 869d710198af9eb3dfee3e167cb432389d04f76d (diff) | |
| parent | e06edc67c049c65c3952a8447e22717a0f492020 (diff) | |
Merge pull request #7689 from eska014/webgl2
Enable WebGL2 in web export, start fixing build
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 3 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 3 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 458da85e74..2923dfff9f 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -1,8 +1,7 @@ #include "rasterizer_canvas_gles3.h" #include "os/os.h" -#ifdef IPHONE_ENABLED -// for some reason glClearDepth seems to have been removed in iOS ES3.h +#ifndef GLES_OVER_GL #define glClearDepth glClearDepthf #endif diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index b972c6a877..c0af9b3bcf 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -3,8 +3,7 @@ #include "os/os.h" #include "rasterizer_canvas_gles3.h" -#ifdef IPHONE_ENABLED -// for some reason glClearDepth seems to have been removed in iOS ES3.h +#ifndef GLES_OVER_GL #define glClearDepth glClearDepthf #endif diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 96befee869..a96fd8dd41 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -135,7 +135,7 @@ Image RasterizerStorageGLES3::_get_gl_image_and_format(const Image& p_image, Ima } break; case Image::FORMAT_RGB565: { -#ifdef IPHONE_ENABLED +#ifndef GLES_OVER_GL r_gl_internal_format=GL_RGB565; #else //#warning TODO: Convert tod 555 if 565 is not supported (GLES3.3-) |