Skip to content

render/opengl: fix blur rendering #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Znarf64 wants to merge 1 commit into
base: dev
Choose a base branch
from
+65 −12
Open

render/opengl: fix blur rendering #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/render/opengl/generated/render_opengl.meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ str8_lit_comp(
" \n"
" // rjf: sample for corners\n"
" float corner_sdf_s = rect_sdf(sdf_sample_pos, rect_half_size, corner_radius);\n"
" float corner_sdf_t = smoothstep(0, 2, corner_sdf_s);\n"
" float corner_sdf_t = 1-smoothstep(0, 2, corner_sdf_s);\n"
" \n"
" // rjf: weight output color by sdf\n"
" // this is doing alpha testing, leave blurring only where mostly opaque pixels are\n"
Expand Down
73 changes: 63 additions & 10 deletions src/render/opengl/render_opengl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,64 @@ r_ogl_tex2d_from_handle(R_Handle h)
internal R_OGL_FormatInfo
r_ogl_format_info_from_tex2dformat(R_Tex2DFormat fmt)
{
R_OGL_FormatInfo result;
result.internal_format = GL_RGBA;
result.format = GL_RGBA;
result.base_type = GL_UNSIGNED_BYTE;
// TODO(rjf)
R_OGL_FormatInfo result = {0};
switch (fmt) {
case R_Tex2DFormat_R8:
{
result.internal_format = GL_RED;
result.format = GL_RED;
result.base_type = GL_UNSIGNED_BYTE;
} break;
case R_Tex2DFormat_RG8:
{
result.internal_format = GL_RG;
result.format = GL_RG;
result.base_type = GL_UNSIGNED_BYTE;
} break;
case R_Tex2DFormat_RGBA8:
{
result.internal_format = GL_RGBA;
result.format = GL_RGBA;
result.base_type = GL_UNSIGNED_BYTE;
} break;
case R_Tex2DFormat_BGRA8:
{
result.internal_format = GL_RGBA;
result.format = GL_BGRA;
result.base_type = GL_UNSIGNED_BYTE;
} break;
case R_Tex2DFormat_R16:
{
result.internal_format = GL_RED;
result.format = GL_RED;
result.base_type = GL_UNSIGNED_SHORT;
} break;
case R_Tex2DFormat_RGBA16:
{
result.internal_format = GL_RGBA;
result.format = GL_RGBA;
result.base_type = GL_UNSIGNED_SHORT;
} break;
case R_Tex2DFormat_R32:
{
result.internal_format = GL_RED;
result.format = GL_RED;
result.base_type = GL_UNSIGNED_INT;
} break;
case R_Tex2DFormat_RG32:
{
result.internal_format = GL_RG;
result.format = GL_RG;
result.base_type = GL_UNSIGNED_INT;
} break;
case R_Tex2DFormat_RGBA32:
{
result.internal_format = GL_RGBA;
result.format = GL_RGBA;
result.base_type = GL_UNSIGNED_INT;
} break;
case R_Tex2DFormat_COUNT: {} break;
}
return result;
}

Expand Down Expand Up @@ -418,7 +471,7 @@ r_window_begin_frame(WM_Window os, R_Handle r)
glBindFramebufferScope(GL_FRAMEBUFFER, targets[idx]->fbo)
glBindTextureScope(GL_TEXTURE_2D, targets[idx]->color_texture)
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (S32)client_rect_dim.x, (S32)client_rect_dim.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, (S32)client_rect_dim.x, (S32)client_rect_dim.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, targets[idx]->color_texture, 0);
}
}
Expand Down Expand Up @@ -677,8 +730,8 @@ r_window_submit(WM_Window window, R_Handle window_equip, R_PassList *passes)
glBindFramebufferScope(GL_FRAMEBUFFER, w->stage_scratch_target.fbo)
glBindTextureScope(GL_TEXTURE_2D, w->stage_target.color_texture)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glUniform2f(glGetUniformLocation(shader, "direction"), 1.f/viewport_dim.x, 0);
glUniform1i(glGetUniformLocation(shader, "tex"), 0);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
Expand All @@ -688,8 +741,8 @@ r_window_submit(WM_Window window, R_Handle window_equip, R_PassList *passes)
glBindFramebufferScope(GL_FRAMEBUFFER, w->stage_target.fbo)
glBindTextureScope(GL_TEXTURE_2D, w->stage_scratch_target.color_texture)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glUniform2f(glGetUniformLocation(shader, "direction"), 0, 1.f/viewport_dim.y);
glUniform1i(glGetUniformLocation(shader, "tex"), 0);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
Expand Down
2 changes: 1 addition & 1 deletion src/render/opengl/render_opengl.mdesk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ void main(void)

// rjf: sample for corners
float corner_sdf_s = rect_sdf(sdf_sample_pos, rect_half_size, corner_radius);
float corner_sdf_t = smoothstep(0, 2, corner_sdf_s);
float corner_sdf_t = 1-smoothstep(0, 2, corner_sdf_s);

// rjf: weight output color by sdf
// this is doing alpha testing, leave blurring only where mostly opaque pixels are
Expand Down