summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-24 07:41:30 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-24 07:41:30 -0500
commit7d378aca99c82726d0f9dfd0969255946a55a145 (patch)
treeb6c01b026fd290b01118761b8bfd6901ff54618b
parent6f356b00bafca3b202c795aae1d0a8ec6d44ac95 (diff)
downloadneg-gles.tar.gz
neg-gles.tar.bz2
update desktop GL code path to use new APIgles
-rw-r--r--src/neg.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/neg.cpp b/src/neg.cpp
index e16f197..e74d3ab 100644
--- a/src/neg.cpp
+++ b/src/neg.cpp
@@ -254,8 +254,7 @@ NegWindow::glDrawTexture (GLTexture *texture,
glTexEnvf(GL_TEXTURE_ENV,
GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
- /* draw the window geometry */
- gWindow->glDrawGeometry ();
+ gWindow->glDrawTexture (texture, transform, attrib, mask);
/* disable the current texture */
texture->disable ();
@@ -271,8 +270,7 @@ NegWindow::glDrawTexture (GLTexture *texture,
{
/* fully opaque and bright */
- /* draw the window geometry */
- gWindow->glDrawGeometry ();
+ gWindow->glDrawTexture (texture, transform, attrib, mask);
}
/* disable the current texture */
@@ -308,8 +306,7 @@ NegWindow::glDrawTexture (GLTexture *texture,
glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, constant);
- /* draw the window geometry */
- gWindow->glDrawGeometry ();
+ gWindow->glDrawTexture (texture, transform, attrib, mask);
}
/* disable the current texture */
@@ -375,15 +372,13 @@ NegWindow::glDrawTexture (GLTexture *texture,
glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
- /* draw the window geometry */
- gWindow->glDrawGeometry ();
+ gWindow->glDrawTexture (texture, transform, attrib, mask);
}
else
{
/* no adjustments to saturation, brightness or opacity */
- /* draw the window geometry */
- gWindow->glDrawGeometry ();
+ gWindow->glDrawTexture (texture, transform, attrib, mask);
}
/* disable the current texture */