Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions code/bmpman/bmpman.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ void bm_close();
#define BMP_FLAG_RENDER_TARGET_DYNAMIC (1<<1)
#define BMP_FLAG_CUBEMAP (1<<2)
#define BMP_FLAG_RENDER_TARGET_MIPMAP (1<<3)
#define BMP_FLAG_RENDER_TARGET_DEPTH_ATTACHMENT (1<<4)

/**
* @brief Allocates memory for the given handle.
Expand Down
19 changes: 12 additions & 7 deletions code/graphics/opengl/gropengltexture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1866,11 +1866,13 @@ int opengl_make_render_target( int handle, int *w, int *h, int *bpp, int *mm_lvl

GL_state.Texture.Enable(0);

// render buffer
// glGenRenderbuffers(1, &new_fbo.renderbuffer_id);
// glBindRenderbuffer(GL_RENDERBUFFER, new_fbo.renderbuffer_id);
// glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, *w, *h);
glBindRenderbuffer(GL_RENDERBUFFER, 0);
// render buffer (depth)
if (flags & BMP_FLAG_RENDER_TARGET_DEPTH_ATTACHMENT) {
glGenRenderbuffers(1, &new_fbo->renderbuffer_id);
glBindRenderbuffer(GL_RENDERBUFFER, new_fbo->renderbuffer_id);
glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, *w, *h);
glBindRenderbuffer(GL_RENDERBUFFER, 0);
}

// frame buffer
glGenFramebuffers(1, &new_fbo->framebuffer_id);
Expand All @@ -1883,7 +1885,7 @@ int opengl_make_render_target( int handle, int *w, int *h, int *bpp, int *mm_lvl
glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ts->texture_id, 0, 0);
}

// glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, new_fbo.renderbuffer_id);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, new_fbo->renderbuffer_id);

if ( opengl_check_framebuffer() ) {
// Oops!! reset everything and then bail
Expand All @@ -1898,7 +1900,10 @@ int opengl_make_render_target( int handle, int *w, int *h, int *bpp, int *mm_lvl

glDeleteFramebuffers(1, &new_fbo->framebuffer_id);

// glDeleteRenderbuffersEXT(1, &new_fbo.renderbuffer_id);
if (new_fbo->renderbuffer_id) {
glDeleteRenderbuffers(1, &new_fbo->renderbuffer_id);
new_fbo->renderbuffer_id = 0;
}

opengl_set_texture_target();
opengl_free_fbo_slot(fbo_id);
Expand Down
5 changes: 4 additions & 1 deletion code/graphics/opengl/gropengltnl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,10 @@ void opengl_tnl_set_model_material(model_material *material_info)
opengl_tnl_set_material(material_info, false, false);

if ( GL_state.CullFace() ) {
GL_state.FrontFaceValue(GL_CW);
// Model rendering uses CW front faces in the default backbuffer path.
// Render-to-texture flips the projection vertically, which flips winding,
// so we must invert the front-face definition there.
GL_state.FrontFaceValue(gr_screen.rendering_to_texture != -1 ? GL_CCW : GL_CW);
}

gr_set_center_alpha(material_info->get_center_alpha());
Expand Down
2 changes: 1 addition & 1 deletion code/scripting/api/libs/graphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1663,7 +1663,7 @@ ADE_FUNC(createTexture, l_Graphics, "[number Width=512, number Height=512, enume
t = BMP_FLAG_RENDER_TARGET_DYNAMIC;
}

int idx = bm_make_render_target(w, h, t);
int idx = bm_make_render_target(w, h, t | BMP_FLAG_RENDER_TARGET_DEPTH_ATTACHMENT);

if(idx < 0)
return ade_set_error(L, "o", l_Texture.Set(texture_h()));
Expand Down
Loading