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

Increased OpenGL ES compatibility #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

dvangestel
Copy link

change indices from unsigned int to unsigned short since glDrawElements doesn't support GL_UNSIGNED_INT unless you have the GL_OES_element_index_uint extension
change GL_RED to GL_LUMINANCE since GL_RED doesn't exist in OpenGL ES

change indices from unsigned int to unsigned short since glDrawElements doesn't support GL_UNSIGNED_INT unless you have the GL_OES_element_index_uint extension
change GL_RED to GL_LUMINANCE since GL_RED doesn't exist in OpenGL ES
@@ -338,8 +338,8 @@ texture_atlas_upload( texture_atlas_t * self )
}
else
{
glTexImage2D( GL_TEXTURE_2D, 0, GL_RED, self->width, self->height,
0, GL_RED, GL_UNSIGNED_BYTE, self->data );
glTexImage2D( GL_TEXTURE_2D, 0, GL_LUMINANCE, self->width, self->height,
Copy link
Owner

Choose a reason for hiding this comment

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

We might have a conflict here with OpenGL > 3

@rougier
Copy link
Owner

rougier commented Sep 1, 2015

Thanks for the PR. I think it needs more testing from the community because I suspect it might break things (even if Travis is ok) because of the change from int to short.

@rougier
Copy link
Owner

rougier commented Dec 21, 2015

Sorry for the long delay, can you update your PR (rebase) ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants