libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 18:30:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9510 from xebra/fix_hwtess_gles

Browse Source 
Fix hwtess gles
This commit is contained in:
Henrik Rydgård 2017-03-28 13:17:32 +02:00 committed by GitHub
commit b0b72cd63e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GPU/GLES/GPU_GLES.cpp
View File

@ -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;

7
UI/GameSettingsScreen.cpp
View File

@ -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;
@ -328,7 +327,7 @@ void GameSettingsScreen::CreateViews() {
bezierChoiceDisable_ = g_Config.bSoftwareRendering || g_Config.bHardwareTessellation;
beziersChoice->SetDisabledPtr(&bezierChoiceDisable_);
CheckBox *tessellationHW = graphicsSettings->Add(new CheckBox(&g_Config.bHardwareTessellation, gr->T("Hardware Tessellation")));
CheckBox *tessellationHW = graphicsSettings->Add(new CheckBox(&g_Config.bHardwareTessellation, gr->T("Hardware Tessellation", "Hardware tessellation (experimental)")));
tessellationHW->OnClick.Add([=](EventParams &e) {
bezierChoiceDisable_ = g_Config.bSoftwareRendering || g_Config.bHardwareTessellation;
settingInfo_->Show(gr->T("HardwareTessellation Tip", "Uses hardware to make curves, always uses a fixed quality"), e.v);