b/minifb-zig-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use OpenGL legacy API for X11 (faster than draw XImages)

Browse Source
This commit is contained in:
Carlos Aragones
2020-09-18 15:05:39 +02:00
parent 09338014d1
commit 41e087433a
6 changed files with 192 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
src/gl/MiniFB_GL.c
View File

@ -3,8 +3,13 @@
#include "MiniFB_GL.h"
#if defined(_WIN32) || defined(WIN32)
#include <windows/WindowData_Win.h>
#include <gl/gl.h>
#elif defined(linux)
#include <x11/WindowData_X11.h>
#include <GL/gl.h>
#include <GL/glx.h>
#endif
#include <gl/gl.h>
#include <stdio.h>
#include <stdlib.h>
//#define kUse_Clean_UP
@ -15,22 +20,8 @@
#endif
//-------------------------------------
void setup_pixel_format(HDC hDC);
//-------------------------------------
void
create_GL_context(SWindowData *window_data) {
SWindowData_Win *window_data_win;
window_data_win = (SWindowData_Win *) window_data->specific;
setup_pixel_format(window_data_win->hdc);
window_data_win->hGLRC = wglCreateContext(window_data_win->hdc);
wglMakeCurrent(window_data_win->hdc, window_data_win->hGLRC);
init_GL(window_data);
}
//-------------------------------------
void
#if defined(_WIN32) || defined(WIN32)
bool
setup_pixel_format(HDC hDC) {
int pixelFormat;
@ -58,23 +49,122 @@ setup_pixel_format(HDC hDC) {
pixelFormat = ChoosePixelFormat(hDC, &pfd);
if (pixelFormat == 0) {
MessageBox(WindowFromDC(hDC), "ChoosePixelFormat failed.", "Error", MB_ICONERROR | MB_OK);
exit(1);
return false;
}
if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
MessageBox(WindowFromDC(hDC), "SetPixelFormat failed.", "Error", MB_ICONERROR | MB_OK);
exit(1);
return false;
}
return true;
}
#endif
//-------------------------------------
bool
create_GL_context(SWindowData *window_data) {
#if defined(_WIN32) || defined(WIN32)
SWindowData_Win *window_data_win = (SWindowData_Win *) window_data->specific;
if(setup_pixel_format(window_data_win->hdc) == false)
return false;
window_data_win->hGLRC = wglCreateContext(window_data_win->hdc);
wglMakeCurrent(window_data_win->hdc, window_data_win->hGLRC);
init_GL(window_data);
return true;
#elif defined(linux)
SWindowData_X11 *window_data_x11 = (SWindowData_X11 *) window_data->specific;
GLint majorGLX, minorGLX = 0;
glXQueryVersion(window_data_x11->display, &majorGLX, &minorGLX);
if (majorGLX <= 1 && minorGLX < 2) {
fprintf(stderr, "GLX 1.2 or greater is required.\n");
XCloseDisplay(window_data_x11->display);
return false;
}
else {
//fprintf(stdout, "GLX version: %d.%d\n", majorGLX, minorGLX);
}
GLint glxAttribs[] = {
GLX_RGBA,
GLX_DOUBLEBUFFER,
GLX_DEPTH_SIZE, 24,
GLX_STENCIL_SIZE, 8,
GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8,
GLX_DEPTH_SIZE, 24,
GLX_STENCIL_SIZE, 8,
GLX_SAMPLE_BUFFERS, 0,
GLX_SAMPLES, 0,
None
};
XVisualInfo* visualInfo = glXChooseVisual(window_data_x11->display, window_data_x11->screen, glxAttribs);
if (visualInfo == 0) {
fprintf(stderr, "Could not create correct visual window.\n");
XCloseDisplay(window_data_x11->display);
return false;
}
window_data_x11->context = glXCreateContext(window_data_x11->display, visualInfo, NULL, GL_TRUE);
glXMakeCurrent(window_data_x11->display, window_data_x11->window, window_data_x11->context);
//fprintf(stdout, "GL Vendor: %s\n", glGetString(GL_VENDOR));
//fprintf(stdout, "GL Renderer: %s\n", glGetString(GL_RENDERER));
//fprintf(stdout, "GL Version: %s\n", glGetString(GL_VERSION));
//fprintf(stdout, "GL Shading Language: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION));
init_GL(window_data);
return true;
#endif
}
#define TEXTURE0 0x84C0
//-------------------------------------
void
destroy_GL_context(SWindowData *window_data) {
#if defined(_WIN32) || defined(WIN32)
SWindowData_Win *window_data_win = (SWindowData_Win *) window_data->specific;
if (window_data_win->hGLRC) {
wglMakeCurrent(NULL, NULL);
wglDeleteContext(window_data_win->hGLRC);
window_data_win->hGLRC = 0;
}
#elif defined(linux)
SWindowData_X11 *window_data_x11 = (SWindowData_X11 *) window_data->specific;
glXDestroyContext(window_data_x11->display, window_data_x11->context);
#endif
}
//-------------------------------------
#define TEXTURE0 0x84C0 // [ Core in gl 1.3, gles1 1.0, gles2 2.0, glsc2 2.0, Provided by GL_ARB_multitexture (gl) ]
#define RGB 0x1907 // [ Core in gl 1.0, gles1 1.0, gles2 2.0, glsc2 2.0 ]
#define RGBA 0x1908 // [ Core in gl 1.0, gles1 1.0, gles2 2.0, glsc2 2.0 ]
#define BGR 0x80E0 // [ Core in gl 1.2 ]
#define BGRA 0x80E1 // [ Core in gl 1.2, Provided by GL_ARB_vertex_array_bgra (gl|glcore) ]
//-------------------------------------
void
init_GL(SWindowData *window_data) {
SWindowData_Win *window_data_win;
#if defined(_WIN32) || defined(WIN32)
SWindowData_Win *window_data_ex = (SWindowData_Win *) window_data->specific;
#elif defined(linux)
SWindowData_X11 *window_data_ex = (SWindowData_X11 *) window_data->specific;
#endif
window_data_win = (SWindowData_Win *) window_data->specific;
glViewport(0, 0, window_data->window_width, window_data->window_height);
@ -90,9 +180,9 @@ init_GL(SWindowData *window_data) {
glEnable(GL_TEXTURE_2D);
glGenTextures(1, &window_data_win->text_id);
glGenTextures(1, &window_data_ex->text_id);
//glActiveTexture(TEXTURE0);
glBindTexture(GL_TEXTURE_2D, window_data_win->text_id);
glBindTexture(GL_TEXTURE_2D, window_data_ex->text_id);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -123,10 +213,19 @@ resize_GL(SWindowData *window_data) {
//-------------------------------------
void
redraw_GL(SWindowData *window_data, const void *pixels) {
float x, y, w, h;
SWindowData_Win *window_data_ex;
#if defined(_WIN32) || defined(WIN32)
window_data_ex = (SWindowData_Win *) window_data->specific;
SWindowData_Win *window_data_ex = (SWindowData_Win *) window_data->specific;
GLenum format = GL_RGBA;
#elif defined(linux)
SWindowData_X11 *window_data_ex = (SWindowData_X11 *) window_data->specific;
GLenum format = GL_BGRA; // for some reason the colors are inverted on X11
#endif
float x, y, w, h;
x = (float) window_data->dst_offset_x;
y = (float) window_data->dst_offset_y;
@ -150,7 +249,7 @@ redraw_GL(SWindowData *window_data, const void *pixels) {
glClear(GL_COLOR_BUFFER_BIT);
UseCleanUp(glBindTexture(GL_TEXTURE_2D, window_data_ex->text_id));
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, window_data->buffer_width, window_data->buffer_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, window_data->buffer_width, window_data->buffer_height, 0, format, GL_UNSIGNED_BYTE, pixels);
//glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, window_data->buffer_width, window_data->buffer_height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
UseCleanUp(glEnableClientState(GL_VERTEX_ARRAY));
@ -164,7 +263,11 @@ redraw_GL(SWindowData *window_data, const void *pixels) {
UseCleanUp(glDisableClientState(GL_VERTEX_ARRAY));
UseCleanUp(glBindTexture(GL_TEXTURE_2D, 0));
#if defined(_WIN32) || defined(WIN32)
SwapBuffers(window_data_ex->hdc);
#elif defined(linux)
glXSwapBuffers(window_data_ex->display, window_data_ex->window);
#endif
}
#endif

4
src/gl/MiniFB_GL.h
View File

@ -3,8 +3,10 @@
#if defined(USE_OPENGL_API)
#include "WindowData.h"
#include <stdbool.h>
void create_GL_context(SWindowData *window_data);
bool create_GL_context(SWindowData *window_data);
void destroy_GL_context(SWindowData *window_data);
void init_GL(SWindowData *window_data);
void redraw_GL(SWindowData *window_data, const void *pixels);
void resize_GL(SWindowData *window_data);