From 5784b5142807551abaaf5d1220d7d27032c41234 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 21 Sep 2017 20:20:17 -0700 Subject: [PATCH] GLES: Allow hwtess for GL 3.1 w/o shader4. gl_InstanceID was added to core in 3.1, so we don't need gpu_shader4. --- GPU/GLES/GPU_GLES.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 6a514a7b6a..a36450a494 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -299,7 +299,7 @@ void GPU_GLES::CheckGPUFeatures() { features |= GPU_SUPPORTS_ANISOTROPY; bool canUseInstanceID = gl_extensions.EXT_draw_instanced || gl_extensions.ARB_draw_instanced; - bool canDefInstanceID = gl_extensions.IsGLES || gl_extensions.EXT_gpu_shader4; + bool canDefInstanceID = gl_extensions.IsGLES || gl_extensions.EXT_gpu_shader4 || gl_extensions.VersionGEThan(3, 1); bool instanceRendering = gl_extensions.GLES3 || (canUseInstanceID && canDefInstanceID); features |= GPU_SUPPORTS_INSTANCE_RENDERING; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c8754c61a5..d30aebb853 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -94,7 +94,7 @@ 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.IsGLES || gl_extensions.EXT_gpu_shader4; + bool canDefInstanceID = gl_extensions.IsGLES || gl_extensions.EXT_gpu_shader4 || gl_extensions.VersionGEThan(3, 1); bool instanceRendering = gl_extensions.GLES3 || (canUseInstanceID && canDefInstanceID); bool textureFloat = gl_extensions.ARB_texture_float || gl_extensions.OES_texture_float;