projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert recent changes about not including compute in combined limits.
[mesa.git]
/
src
/
mesa
/
main
/
drawtex.c
diff --git
a/src/mesa/main/drawtex.c
b/src/mesa/main/drawtex.c
index c2ad5f238629243283ae3525b76648ef9f6faeac..6114b3277b03399b5a6abf77d6b272e9c0e0b4ac 100644
(file)
--- a/
src/mesa/main/drawtex.c
+++ b/
src/mesa/main/drawtex.c
@@
-21,16
+21,15
@@
* DEALINGS IN THE SOFTWARE.
*/
* DEALINGS IN THE SOFTWARE.
*/
+#include "main/errors.h"
#include "main/drawtex.h"
#include "main/state.h"
#include "main/imports.h"
#include "main/drawtex.h"
#include "main/state.h"
#include "main/imports.h"
-
-
-#if FEATURE_OES_draw_texture
+#include "main/mtypes.h"
static void
static void
-draw_texture(
GL
context *ctx, GLfloat x, GLfloat y, GLfloat z,
+draw_texture(
struct gl_
context *ctx, GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height)
{
if (!ctx->Extensions.OES_draw_texture) {
GLfloat width, GLfloat height)
{
if (!ctx->Extensions.OES_draw_texture) {
@@
-43,16
+42,20
@@
draw_texture(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
return;
}
return;
}
+ _mesa_set_vp_override(ctx, GL_TRUE);
+
if (ctx->NewState)
_mesa_update_state(ctx);
if (ctx->NewState)
_mesa_update_state(ctx);
-
ASSERT
(ctx->Driver.DrawTex);
+
assert
(ctx->Driver.DrawTex);
ctx->Driver.DrawTex(ctx, x, y, z, width, height);
ctx->Driver.DrawTex(ctx, x, y, z, width, height);
+
+ _mesa_set_vp_override(ctx, GL_FALSE);
}
void GLAPIENTRY
}
void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+_mesa_DrawTexf
OES
(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, x, y, z, width, height);
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, x, y, z, width, height);
@@
-60,7
+63,7
@@
_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
void GLAPIENTRY
void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords)
+_mesa_DrawTexfv
OES
(const GLfloat *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
@@
-68,7
+71,7
@@
_mesa_DrawTexfv(const GLfloat *coords)
void GLAPIENTRY
void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+_mesa_DrawTexi
OES
(GLint x, GLint y, GLint z, GLint width, GLint height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@
-77,7
+80,7
@@
_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
void GLAPIENTRY
void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords)
+_mesa_DrawTexiv
OES
(const GLint *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
@@
-86,7
+89,7
@@
_mesa_DrawTexiv(const GLint *coords)
void GLAPIENTRY
void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+_mesa_DrawTexs
OES
(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@
-95,7
+98,7
@@
_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
void GLAPIENTRY
void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords)
+_mesa_DrawTexsv
OES
(const GLshort *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
@@
-127,5
+130,3
@@
_mesa_DrawTexxv(const GLfixed *coords)
(GLfloat) coords[3] / 65536.0f,
(GLfloat) coords[4] / 65536.0f);
}
(GLfloat) coords[3] / 65536.0f,
(GLfloat) coords[4] / 65536.0f);
}
-
-#endif /* FEATURE_OES_draw_texture */