Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-09-25 00:17:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use glClear() to initialize texture in gfx_init_texture_rgba()

Browse Source 
This is faster when initializing large textures.
This commit is contained in:
kichikuou
2024-06-19 07:45:55 +09:00
parent 6379dbad4b
commit 04d5237020
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/3d/renderer.c
+1
View File
@@ -824,6 +824,7 @@ void RE_render(struct sact_sprite *sp)
if (glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
ERROR("Incomplete framebuffer");
glClearColor(0.f, 0.f, 0.f, 1.f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Draw background CGs.
src/dungeon/dungeon.c
+1
View File
@@ -271,6 +271,7 @@ static void dungeon_render(struct sact_sprite *sp)
if (glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
ERROR("Incomplete framebuffer");
glClearColor(0.f, 0.f, 0.f, 1.f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
src/video.c
+12 -17
View File
@@ -66,6 +66,7 @@ static struct shader default_shader;
GLuint main_surface_fb;
struct texture main_surface;
static GLint max_texture_size;
static SDL_Color clear_color = { 0, 0, 0, 255 };
static GLchar *read_shader_file(const char *path)
{
@@ -130,8 +131,6 @@ static int gl_initialize(void)
{
gfx_load_shader(&default_shader, "shaders/render.v.glsl", "shaders/render.f.glsl");
glClearColor(0.f, 0.f, 0.f, 1.f);
GLfloat vertex_data[] = {
0.f, 0.f, 0.f, 1.f,
1.f, 0.f, 0.f, 1.f,
@@ -322,15 +321,15 @@ void gfx_set_wait_vsync(bool wait)
void gfx_set_clear_color(int r, int g, int b, int a)
{
float rf = max(0, min(255, r)) / 255.0;
float gf = max(0, min(255, g)) / 255.0;
float bf = max(0, min(255, b)) / 255.0;
float af = max(0, min(255, a)) / 255.0;
glClearColor(rf, gf, bf, af);
clear_color.r = max(0, min(255, r));
clear_color.g = max(0, min(255, g));
clear_color.b = max(0, min(255, b));
clear_color.a = max(0, min(255, a));
}
void gfx_clear(void)
{
glClearColor(clear_color.r / 255.f, clear_color.g / 255.f, clear_color.b / 255.f, clear_color.a / 255.f);
glClear(GL_COLOR_BUFFER_BIT);
}
@@ -338,7 +337,7 @@ void gfx_swap(void)
{
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glViewport(sdl.viewport.x, sdl.viewport.y, sdl.viewport.w, sdl.viewport.h);
glClear(GL_COLOR_BUFFER_BIT);
gfx_clear();
static mat4 mw_transform = GLM_MAT4_IDENTITY_INIT;
static mat4 wv_transform = MAT4(
@@ -491,15 +490,11 @@ void gfx_init_texture_rgba(struct texture *t, int w, int h, SDL_Color color)
WARNING("Texture height %d exceeds maximum texture size %d", h, max_texture_size);
h = max_texture_size;
}
// create pixel data
int c = SDL_MapRGBA(sdl.format, color.r, color.g, color.b, color.a);
uint32_t *pixels = xmalloc(sizeof(uint32_t) * w * h);
for (int i = 0; i < w*h; i++) {
pixels[i] = c;
}
gfx_init_texture_with_pixels(t, w, h, pixels);
free(pixels);
gfx_init_texture_blank(t, w, h);
GLuint fbo = gfx_set_framebuffer(GL_DRAW_FRAMEBUFFER, t, 0, 0, w, h);
glClearColor(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
glClear(GL_COLOR_BUFFER_BIT);
gfx_reset_framebuffer(GL_DRAW_FRAMEBUFFER, fbo);
}
void gfx_init_texture_rgb(struct texture *t, int w, int h, SDL_Color color)