From 73a898df2a37a1c7ad29732ed97d1c0339094d26 Mon Sep 17 00:00:00 2001 From: xebra Date: Tue, 28 Mar 2017 19:49:37 +0900 Subject: [PATCH] GLES:Fix again compatibility for instanced rendering. --- GPU/GLES/GPU_GLES.cpp | 5 ++--- UI/GameSettingsScreen.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 62ec9796bc..e7bbb99469 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -300,9 +300,8 @@ void GPU_GLES::CheckGPUFeatures() { features |= GPU_SUPPORTS_ANISOTROPY; bool canUseInstanceID = gl_extensions.EXT_draw_instanced || gl_extensions.ARB_draw_instanced; - bool canDefInstanceID = gl_extensions.GLES3 || gl_extensions.EXT_gpu_shader4 - || (!gl_extensions.IsGLES && gl_extensions.VersionGEThan(3, 1)/*GLSL 1.4*/); - if (canUseInstanceID && canDefInstanceID) + bool canDefInstanceID = gl_extensions.IsGLES || gl_extensions.EXT_gpu_shader4; + bool instanceRendering = gl_extensions.GLES3 || (canUseInstanceID && canDefInstanceID); features |= GPU_SUPPORTS_INSTANCE_RENDERING; int maxVertexTextureImageUnits; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index b7658dbc46..af28b05f4a 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -93,9 +93,8 @@ bool CheckSupportInstancedTessellationGLES() { bool vertexTexture = maxVertexTextureImageUnits >= 3; // At least 3 for hardware tessellation bool canUseInstanceID = gl_extensions.EXT_draw_instanced || gl_extensions.ARB_draw_instanced; - bool canDefInstanceID = gl_extensions.GLES3 || gl_extensions.EXT_gpu_shader4 - || (!gl_extensions.IsGLES && gl_extensions.VersionGEThan(3, 1)/*GLSL 1.4*/); - bool instanceRendering = canUseInstanceID && canDefInstanceID; + bool canDefInstanceID = gl_extensions.IsGLES || gl_extensions.EXT_gpu_shader4; + bool instanceRendering = gl_extensions.GLES3 || (canUseInstanceID && canDefInstanceID); bool textureFloat = gl_extensions.ARB_texture_float || gl_extensions.OES_texture_float;