Skip to content
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.

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

Handle a missed GL_HALF_FLOAT vs GL_HALF_FLOAT_OES case. #2646

Merged
merged 1 commit into from
Mar 7, 2019

Conversation

pmuetschard
Copy link
Member

GL_HALF_FLOAT does not have the same value as GL_HALF_FLOAT_OES. We need to handle both everywhere, but missed it in GetSizedFormatFromTuple.

Fixes #2603

`GL_HALF_FLOAT` does not have the same value as `GL_HALF_FLOAT_OES`.
We need to handle both everywhere, but missed it in
`GetSizedFormatFromTuple`.

Fixes google#2603
@if(Extension.GL_OES_texture_float)
case GL_FLOAT: GL_LUMINANCE32F_EXT
default: GL_NONE
}
case GL_ALPHA: switch type {
case GL_UNSIGNED_BYTE: GL_ALPHA8_EXT
@if(Extension.GL_OES_texture_half_float)
case GL_HALF_FLOAT_OES: GL_ALPHA16F_EXT
case GL_HALF_FLOAT, GL_HALF_FLOAT_OES: GL_ALPHA16F_EXT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't CheckTextureDataType (line 503) need update as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. that one already handles both constants. Make sure to read through the whole function to notice.

@pmuetschard pmuetschard merged commit c434b95 into google:master Mar 7, 2019
@pmuetschard pmuetschard deleted the half_float branch March 7, 2019 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants