Miroirs/wipeout-rewrite
1
0
Fork 0
mirror of https://github.com/phoboslab/wipeout-rewrite synced 2025-01-13 20:01:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use glGenTextures() and glFramebufferTexture2D() everywhere instead of creating stubs; close #20

Browse source
This commit is contained in:
Dominic Szablewski 2023-08-15 18:04:05 +02:00
parent 5fcf2feec8
commit 676d4ef6ee
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/render_gl.c
View file

@ -3,10 +3,7 @@
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
void glCreateTextures(GLuint ignored, GLsizei n, GLuint *name) {
glGenTextures(1, name);
}
#define glGenVertexArrays glGenVertexArraysAPPLE #define glGenVertexArrays glGenVertexArraysAPPLE
#define glBindVertexArray glBindVertexArrayAPPLE #define glBindVertexArray glBindVertexArrayAPPLE
#define glDeleteVertexArrays glDeleteVertexArraysAPPLE #define glDeleteVertexArrays glDeleteVertexArraysAPPLE
@ -15,16 +12,6 @@
#elif defined(__unix__) #elif defined(__unix__)
#include <GL/glew.h> #include <GL/glew.h>
#ifdef __EMSCRIPTEN__
void glCreateTextures(GLuint ignored, GLsizei n, GLuint *name) {
glGenTextures(1, name);
}
void glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level) {
glFramebufferTexture2D(target, attachment, GL_TEXTURE_2D, texture, level);
}
#endif
// WINDOWS // WINDOWS
#else #else
#include <windows.h> #include <windows.h>
@ -419,7 +406,7 @@ void render_init(vec2i_t screen_size) {
// Atlas Texture // Atlas Texture
glCreateTextures(GL_TEXTURE_2D, 1, &atlas_texture); glGenTextures(1, &atlas_texture);
glBindTexture(GL_TEXTURE_2D, atlas_texture); glBindTexture(GL_TEXTURE_2D, atlas_texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, RENDER_USE_MIPMAPS ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, RENDER_USE_MIPMAPS ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR);
@ -559,7 +546,7 @@ void render_set_resolution(render_resolution_t res) {
glBindFramebuffer(GL_FRAMEBUFFER, backbuffer); glBindFramebuffer(GL_FRAMEBUFFER, backbuffer);
glBindRenderbuffer(GL_RENDERBUFFER, backbuffer_depth_buffer); glBindRenderbuffer(GL_RENDERBUFFER, backbuffer_depth_buffer);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, backbuffer_depth_buffer); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, backbuffer_depth_buffer);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, backbuffer_texture, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, backbuffer_texture, 0);
glBindRenderbuffer(GL_RENDERBUFFER, backbuffer_depth_buffer); glBindRenderbuffer(GL_RENDERBUFFER, backbuffer_depth_buffer);
glRenderbufferStorage(GL_RENDERBUFFER, RENDER_DEPTH_BUFFER_INTERNAL_FORMAT, backbuffer_size.x, backbuffer_size.y); glRenderbufferStorage(GL_RENDERBUFFER, RENDER_DEPTH_BUFFER_INTERNAL_FORMAT, backbuffer_size.x, backbuffer_size.y);