summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2014-01-08 08:52:00 -0800
committerIan Romanick <ian.d.romanick@intel.com>2014-01-20 11:32:00 -0800
commita4bc73f7ba397c03d0d7a796597bd0fea114df91 (patch)
tree563f91725155bbba7ad48205663d2f5b4512a5b9 /src
parent91ad85187682b16458c6bddbf98e79fa446bc947 (diff)
mesa: Change parameter to _mesa_set_viewport to float
This matches the expectations of GL_ARB_viewport_array and the storage type where the values will land. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/viewport.c13
-rw-r--r--src/mesa/main/viewport.h4
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index ad16e875311..07ca920098f 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -35,12 +35,13 @@
#include "viewport.h"
static void
-set_viewport_no_notify(struct gl_context *ctx, unsigned idx, GLint x, GLint y,
- GLsizei width, GLsizei height)
+set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
+ GLfloat x, GLfloat y,
+ GLfloat width, GLfloat height)
{
/* clamp width and height to the implementation dependent range */
- width = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth);
- height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight);
+ width = MIN2(width, (GLfloat) ctx->Const.MaxViewportWidth);
+ height = MIN2(height, (GLfloat) ctx->Const.MaxViewportHeight);
ctx->ViewportArray[idx].X = x;
ctx->ViewportArray[idx].Width = width;
@@ -121,8 +122,8 @@ _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
* \param height height of the viewport rectangle.
*/
void
-_mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLint x, GLint y,
- GLsizei width, GLsizei height)
+_mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLfloat x, GLfloat y,
+ GLfloat width, GLfloat height)
{
set_viewport_no_notify(ctx, idx, x, y, width, height);
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 44bca1b3a1a..6e4c738a51d 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -36,8 +36,8 @@ _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
extern void
-_mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLint x, GLint y,
- GLsizei width, GLsizei height);
+_mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLfloat x, GLfloat y,
+ GLfloat width, GLfloat height);
extern void GLAPIENTRY