diff --git a/.travis.yml b/.travis.yml index 38629ab..3f5f0f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,17 @@ os: - osx matrix: + include: + -os: linux + addons: + apt: + sources: + - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 + packages: + - cmake + - cmake-data + - lcov + - curl allow_failures: - os: osx @@ -33,15 +44,5 @@ before_install: install: true -addons: - apt: - sources: - - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 - packages: - - cmake - - cmake-data - - lcov - - curl - after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/src/os/unix/graphics.c b/src/os/unix/graphics.c index 8cdcaaa..40c7be0 100644 --- a/src/os/unix/graphics.c +++ b/src/os/unix/graphics.c @@ -59,10 +59,10 @@ void GLWindowInit(GLWindow *g) void ShowScreen(GLWindow *g, int w, int h) { - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, g->videoTexture); + glBindTexture(GL_TEXTURE_RECTANGLE, g->videoTexture); // glTexSubImage2D is faster when not using a texture range - glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, g->videoMemory); + glTexSubImage2D(GL_TEXTURE_RECTANGLE, 0, 0, 0, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, g->videoMemory); glBegin(GL_QUADS); glTexCoord2f(0.0f, 0.0f); @@ -100,20 +100,20 @@ void setupGL(GLWindow *g, int w, int h) glLoadIdentity(); glDisable(GL_TEXTURE_2D); - glEnable(GL_TEXTURE_RECTANGLE_ARB); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, g->videoTexture); + glEnable(GL_TEXTURE_RECTANGLE); + glBindTexture(GL_TEXTURE_RECTANGLE, g->videoTexture); // glTextureRangeAPPLE(GL_TEXTURE_RECTANGLE_NV_EXT, 0, NULL); // glTexParameteri(GL_TEXTURE_RECTANGLE_NV_EXT, GL_TEXTURE_STORAGE_HINT_APPLE , GL_STORAGE_CACHED_APPLE); // glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, w, + glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA, w, h, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, g->videoMemory); glDisable(GL_DEPTH_TEST); @@ -136,7 +136,7 @@ void restoreGL(GLWindow *g, int w, int h) glLoadIdentity(); glDisable(GL_TEXTURE_2D); - glEnable(GL_TEXTURE_RECTANGLE_ARB); + glEnable(GL_TEXTURE_RECTANGLE); glDisable(GL_DEPTH_TEST); }