mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 18:36:43 +02:00
Code Issues Releases Wiki Activity

#15 fix OSX and iOS build

Browse Source
This commit is contained in:
Timur Gagiev
2017-08-12 05:04:54 +03:00
parent 7149ddfe38
commit 2a9e6f2cb4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core.h
View File

@@ -92,8 +92,8 @@
#define glDeleteVertexArrays glDeleteVertexArraysOES #define glDeleteVertexArrays glDeleteVertexArraysOES
#define glBindVertexArray glBindVertexArrayOES #define glBindVertexArray glBindVertexArrayOES
#define GL_CLAMP_TO_BORDER GL_CLAMP_TO_BORDER_EXT #define GL_CLAMP_TO_BORDER 0x812D
#define GL_TEXTURE_BORDER_COLOR GL_TEXTURE_BORDER_COLOR_EXT #define GL_TEXTURE_BORDER_COLOR 0x1004
#define GL_TEXTURE_COMPARE_MODE GL_TEXTURE_COMPARE_MODE_EXT #define GL_TEXTURE_COMPARE_MODE GL_TEXTURE_COMPARE_MODE_EXT
#define GL_TEXTURE_COMPARE_FUNC GL_TEXTURE_COMPARE_FUNC_EXT #define GL_TEXTURE_COMPARE_FUNC GL_TEXTURE_COMPARE_FUNC_EXT
@@ -106,6 +106,10 @@
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
#include <AGL/agl.h> #include <AGL/agl.h>
#define GL_RGBA16F 0x881A
#define GL_RGBA32F 0x8814
#define GL_HALF_FLOAT 0x140B
#define GL_RGB565 GL_RGBA #define GL_RGB565 GL_RGBA
#define GL_TEXTURE_COMPARE_MODE 0x884C #define GL_TEXTURE_COMPARE_MODE 0x884C
#define GL_TEXTURE_COMPARE_FUNC 0x884D #define GL_TEXTURE_COMPARE_FUNC 0x884D
@@ -816,7 +820,7 @@ namespace Core {
void copyTarget(Texture *dst, int xOffset, int yOffset, int x, int y, int width, int height) { void copyTarget(Texture *dst, int xOffset, int yOffset, int x, int y, int width, int height) {
validateRenderState(); validateRenderState();
dst->bind(sDiffuse); dst->bind(sDiffuse);
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, xOffset, yOffset, x, y, width, height); glCopyTexSubImage2D(GL_TEXTURE_2D, 0, xOffset, yOffset, x, y, width, height); // TODO: too bad for iOS devices!
} }
vec4 copyPixel(int x, int y) { // GPU sync! vec4 copyPixel(int x, int y) { // GPU sync!