Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix the mistake at resolving conflicts.

Browse source
This commit is contained in:
xebra 2017-02-25 20:01:56 +09:00
parent f9ab61a005
commit f0606bd1c9
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
UI/GameSettingsScreen.cpp
View file

@ -83,15 +83,11 @@ bool GameSettingsScreen::UseVerticalLayout() const {
// This needs before run CheckGPUFeatures()
// TODO: Remove this if fix the issue
<<<<<<< HEAD
bool CheckSupportInstancedTessellation() {
bool CheckSupportInstancedTessellationGLES() {
#if PPSSPP_PLATFORM(UWP)
return true;
#else
// TODO: Make work with non-GL backends
=======
bool CheckSupportInstancedTessellationGLES() {
>>>>>>> 4a6e0c9... [spline/bezier]Add support for unsupported device about HW tess.
int maxVertexTextureImageUnits;
glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &maxVertexTextureImageUnits);
bool vertexTexture = maxVertexTextureImageUnits >= 3; // At least 3 for hardware tessellation