Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAndroid build and crash fixes #92
Merged
+8
−16
Conversation
| @@ -123,13 +124,9 @@ pub fn load_shader(source_string: &str, shader_type: GLenum) -> GLuint { | |||
| shader_source(shader_id, [ source_string.as_bytes() ]); | |||
| compile_shader(shader_id); | |||
|
|
|||
| if get_error() != NO_ERROR { | |||
This comment has been minimized.
This comment has been minimized.
glennw
Jul 30, 2014
Member
I think what we should do here is still check the error, but make sure that get_error() is cleared before we try to compile a shader. You can do this by calling get_error() in a loop until it returns NO_ERROR (see http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetError.xml for details).
|
r+ |
mbrubeck
added a commit
to servo/servo
that referenced
this pull request
Aug 1, 2014
Fixes accidental revert of servo/rust-layers#92.
glennw
pushed a commit
to glennw/servo
that referenced
this pull request
Aug 5, 2014
Fixes accidental revert of servo/rust-layers#92.
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.
mbrubeck commentedJul 29, 2014
Fixes
load_shaderfailing on Android due to an unrelated error flag. Also silences some compiler warnings.