Skip to content

webOS: fix build on 64-bit and use of TEXTURE_EXTERNAL #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cscd98 wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −1
Open

webOS: fix build on 64-bit and use of TEXTURE_EXTERNAL #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions GLideN64/src/Graphics/OpenGLContext/opengl_GLInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ void GLInfo::init() {

eglImageFramebuffer = eglImage && !isGLES2;

#ifdef WEBOS
eglImage = false;
eglImageFramebuffer = false;
#endif

if (config.frameBufferEmulation.N64DepthCompare != Config::dcDisable) {
if (config.frameBufferEmulation.N64DepthCompare == Config::dcFast) {
if (!imageTexturesInterlock && !n64DepthWithFbFetch) {
Expand Down
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,15 @@ ifneq (,$(or $(findstring webos,$(CROSS_COMPILE)),$(findstring starfish,$(CROSS_
# default to GLES v2
GLES = 1
endif
CPUFLAGS += -DWEBOS
GL_LIB := -lGLESv2
HAVE_NEON = 1
ifneq (,$(findstring aarch64,$(CROSS_COMPILE)))
WITH_DYNAREC=aarch64
HAVE_NEON = 0
else
WITH_DYNAREC=arm
HAVE_NEON = 1
endif
endif

ifeq ($(STATIC_LINKING), 1)
Expand Down