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/c_src | |
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/c_src')
-rw-r--r-- | lib/wx/c_src/wxe_helpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/c_src/wxe_helpers.cpp b/lib/wx/c_src/wxe_helpers.cpp index 4798e605e8..d1f607d2af 100644 --- a/lib/wx/c_src/wxe_helpers.cpp +++ b/lib/wx/c_src/wxe_helpers.cpp @@ -48,7 +48,7 @@ void wxeCommand::Delete() driver_free(buffer); buffer = NULL; } - op = -1; + op = -2; } /* **************************************************************************** @@ -84,7 +84,7 @@ wxeCommand * wxeFifo::Get() pos = m_first++; m_n--; m_first %= m_max; - } while(m_q[pos].op == -1); + } while(m_q[pos].op < 0); return &m_q[pos]; } @@ -96,7 +96,7 @@ wxeCommand * wxeFifo::Peek(unsigned int *i) return NULL; pos = (m_first+*i) % m_max; (*i)++; - } while(m_q[pos].op == -1); + } while(m_q[pos].op < 0); return &m_q[pos]; } @@ -213,7 +213,7 @@ void wxeFifo::Realloc() // Strip end of queue if ops are already taken care of, avoids reallocs void wxeFifo::Strip() { - while((m_n > 0) && (m_q[(m_first + m_n - 1)%m_max].op == -1)) { + while((m_n > 0) && (m_q[(m_first + m_n - 1)%m_max].op < -1)) { m_n--; } } |