Skip to content

FS hack fixes for Descent 3 #211

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
Frogging101 wants to merge 2 commits into
base: proton_9.0
Choose a base branch
from
Open

FS hack fixes for Descent 3 #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1373481
fshack: Use texture name hack for Descent 3
Frogging101 Dec 28, 2023
4a9ff0c
fshack: Always allocate a depth buffer
Frogging101 Dec 28, 2023
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
31 changes: 14 additions & 17 deletions dlls/winex11.drv/opengl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,19 +2175,15 @@ static void fs_hack_get_attachments_config( struct gl_drawable *gl, struct fs_ha
config->color_internalformat = attribs->alpha_size ? GL_RGBA8 : GL_RGB8;
config->color_format = GL_BGRA;
config->color_type = GL_UNSIGNED_INT_8_8_8_8_REV;
if (attribs->depth_size || attribs->stencil_size)
{
if (attribs->depth_size != 24) FIXME( "Unsupported depth buffer size %u.\n", attribs->depth_size );
if (attribs->stencil_size && attribs->stencil_size != 8)
FIXME( "Unsupported stencil buffer size %u.\n", attribs->stencil_size );
config->ds_internalformat = attribs->stencil_size ? GL_DEPTH24_STENCIL8 : GL_DEPTH_COMPONENT24;
config->ds_format = attribs->stencil_size ? GL_DEPTH_STENCIL : GL_DEPTH_COMPONENT;
config->ds_type = attribs->stencil_size ? GL_UNSIGNED_INT_24_8 : GL_UNSIGNED_INT;
}
else
{
config->ds_internalformat = config->ds_format = config->ds_type = 0;
}

if (attribs->depth_size && attribs->depth_size != 24)
FIXME( "Unsupported depth buffer size %u.\n", attribs->depth_size );
if (attribs->stencil_size && attribs->stencil_size != 8)
FIXME( "Unsupported stencil buffer size %u.\n", attribs->stencil_size );
config->ds_internalformat = attribs->stencil_size ? GL_DEPTH24_STENCIL8 : GL_DEPTH_COMPONENT24;
config->ds_format = attribs->stencil_size ? GL_DEPTH_STENCIL : GL_DEPTH_COMPONENT;
config->ds_type = attribs->stencil_size ? GL_UNSIGNED_INT_24_8 : GL_UNSIGNED_INT;

config->samples = attribs->samples;
}

Expand Down Expand Up @@ -2384,7 +2380,7 @@ static void gen_texture( struct wgl_context *ctx, GLuint *tex, enum fshack_textu
{
const char *sgi = getenv( "SteamGameId" );

texture_name_hack = sgi && (!strcmp( sgi, "6020" ) || !strcmp( sgi, "2200" ) || !strcmp( sgi, "2350" ));
texture_name_hack = sgi && (!strcmp( sgi, "6020" ) || !strcmp( sgi, "2200" ) || !strcmp( sgi, "2350" ) || !strcmp( sgi, "273590" ));
}

if (!texture_name_hack || opengl_funcs.gl.p_glIsTexture( texture_names[type] ))
Expand Down Expand Up @@ -2544,12 +2540,13 @@ static void fs_hack_setup_context( struct wgl_context *ctx, struct gl_drawable *
height, 0, config.ds_format, config.ds_type, NULL );
opengl_funcs.gl.p_glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0 );
opengl_funcs.gl.p_glBindTexture( GL_TEXTURE_2D, prev_texture );
if (attribs.depth_size)
pglFramebufferTexture2D( GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
GL_TEXTURE_2D, ctx->fs_hack_ds_texture, 0 );
if (attribs.stencil_size)
pglFramebufferTexture2D( GL_DRAW_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
GL_TEXTURE_2D, ctx->fs_hack_ds_texture, 0 );
else
pglFramebufferTexture2D( GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
GL_TEXTURE_2D, ctx->fs_hack_ds_texture, 0 );

TRACE( "Created DS texture %u for fullscreen hack.\n", ctx->fs_hack_ds_texture );
}
}
Expand Down