diff options
author | Courtney Goeltzenleuchter <[email protected]> | 2013-11-13 16:24:56 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2014-01-20 11:31:53 -0800 |
commit | 5b84226c31e941219422f6d60c31524081b7a188 (patch) | |
tree | ddebed7b00cfdb732f4f252907998eea5c4202cf /src/mesa/drivers/common | |
parent | d4dc359875126c432e46e3d1da8610a066d21302 (diff) |
mesa: Converty gl_viewport_attrib::X, ::Y, ::Width, and ::Height to float
v4: Split out from a single megapatch. Suggested by Ken. Also make
meta's save_state::ViewportX, ::ViewportY, ::ViewportW, and ::ViewportH
to match gl_viewport_attrib.
Signed-off-by: Courtney Goeltzenleuchter <[email protected]>
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r-- | src/mesa/drivers/common/meta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 173b45cea0a..3608ee85c58 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -170,7 +170,7 @@ struct save_state struct gl_buffer_object *ArrayBufferObj; /** MESA_META_VIEWPORT */ - GLint ViewportX, ViewportY, ViewportW, ViewportH; + GLfloat ViewportX, ViewportY, ViewportW, ViewportH; GLclampd DepthNear, DepthFar; /** MESA_META_CLAMP_FRAGMENT_COLOR */ @@ -744,8 +744,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) /* set viewport to match window size */ if (ctx->Viewport.X != 0 || ctx->Viewport.Y != 0 || - ctx->Viewport.Width != ctx->DrawBuffer->Width || - ctx->Viewport.Height != ctx->DrawBuffer->Height) { + ctx->Viewport.Width != (float) ctx->DrawBuffer->Width || + ctx->Viewport.Height != (float) ctx->DrawBuffer->Height) { _mesa_set_viewport(ctx, 0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height); } |