diff options
| author | Dan Gudmundsson <[email protected]> | 2016-05-17 14:43:26 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-05-17 14:43:26 +0200 |
| commit | 8f213ab9fc5e87f4d54c134bd3d7017ab772b452 (patch) | |
| tree | 1d8af9c7b5588dce559765f977496d13f671e170 /lib/wx/include/gl.hrl | |
| parent | 0545c22c9c07c55569e067c57ec184f018a54947 (diff) | |
| parent | 415a912b969c24a60c47ff7e74e560047b2d747f (diff) | |
| download | otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.tar.gz otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.tar.bz2 otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.zip | |
Merge branch 'dgud/wx/cmd-queue-bug'
* dgud/wx/cmd-queue-bug:
Fix compilation warning
wx: Fix generated defines in gl.hrl
wx: Fix driver command queue
Diffstat (limited to 'lib/wx/include/gl.hrl')
| -rw-r--r-- | lib/wx/include/gl.hrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/include/gl.hrl b/lib/wx/include/gl.hrl index 39cd474fcb..d708515e1b 100644 --- a/lib/wx/include/gl.hrl +++ b/lib/wx/include/gl.hrl @@ -1723,7 +1723,7 @@ -define(GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER, 16#8A44). -define(GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER, 16#8A45). -define(GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER, 16#8A46). --define(GL_INVALID_INDEX, 16#FFFFFFFFu). +-define(GL_INVALID_INDEX, 16#FFFFFFFF). -define(GL_COPY_READ_BUFFER, 16#8F36). -define(GL_COPY_WRITE_BUFFER, 16#8F37). -define(GL_DEPTH_CLAMP, 16#864F). @@ -1746,7 +1746,7 @@ -define(GL_CONDITION_SATISFIED, 16#911C). -define(GL_WAIT_FAILED, 16#911D). -define(GL_SYNC_FLUSH_COMMANDS_BIT, 16#00000001). --define(GL_TIMEOUT_IGNORED, 16#FFFFFFFFFFFFFFFFull). +-define(GL_TIMEOUT_IGNORED, 16#FFFFFFFFFFFFFFFF). -define(GL_SAMPLE_POSITION, 16#8E50). -define(GL_SAMPLE_MASK, 16#8E51). -define(GL_SAMPLE_MASK_VALUE, 16#8E52). |