NV2A: Check for supported line widths before setting the line width #1792
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
build: Update arm64 target, handle target/arch independent pkg names
nv2a: Scale line thickness by surface scale factor
…g the line width to avoid errors. I also moved the glLineWidth call so that it could be after the call to get the supported line width range for the desired line type.
antangelo
reviewed
Nov 20, 2024
hw/xbox/nv2a/pgraph.c
Outdated
| @@ -3062,9 +3063,12 @@ DEF_METHOD(NV097, SET_BEGIN_END) | |||
| if (!anti_aliasing && pg->regs[NV_PGRAPH_SETUPRASTER] & | |||
| NV_PGRAPH_SETUPRASTER_LINESMOOTHENABLE) { | |||
| glEnable(GL_LINE_SMOOTH); | |||
| glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, supportedLineWidthRange); | |||
There was a problem hiding this comment.
Would it be better to load both line width ranges into separate arrays once during init and then just select between them based on the above condition?
hw/xbox/nv2a/pgraph.c
Outdated
| @@ -381,6 +381,8 @@ static const SurfaceFormatInfo kelvin_surface_zeta_fixed_format_map[] = { | |||
| {4, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH_STENCIL_ATTACHMENT}, | |||
| }; | |||
|
|
|||
| static GLfloat supportedLineWidthRange[2] = { 0.0f, 0.0f }; | |||
There was a problem hiding this comment.
If my other comment does not apply, then I don't think this needs to be a static global
|
The commit/PR title should be of the form |
faha223
changed the title
…D_LINE_WIDTH_RANGE to nv2a_gl_context_init(void) so that it's just called while OpenGL is being initialized.
…eWidth in the if and else blocks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added checks to GL_ALIASED_LINE_WIDTH_RANGE and and GL_SMOOTH_LINE_WIDTH_RANGE to ensure that the line width we set is within the supported range. I also moved the glLineWidth call down a few lines so it would be called after we know the supported line width range.