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/main | |
| 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/main')
| -rw-r--r-- | src/mesa/main/get.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index ad6096baac8..fa48195cdf4 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -691,10 +691,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu break; case GL_VIEWPORT: - v->value_int_4[0] = ctx->Viewport.X; - v->value_int_4[1] = ctx->Viewport.Y; - v->value_int_4[2] = ctx->Viewport.Width; - v->value_int_4[3] = ctx->Viewport.Height; + v->value_float_4[0] = ctx->Viewport.X; + v->value_float_4[1] = ctx->Viewport.Y; + v->value_float_4[2] = ctx->Viewport.Width; + v->value_float_4[3] = ctx->Viewport.Height; break; case GL_DEPTH_RANGE: diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 8e2fdaec956..3aa05483c84 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -44,7 +44,7 @@ descriptor=[ [ "SUBPIXEL_BITS", "CONTEXT_INT(Const.SubPixelBits), NO_EXTRA" ], [ "TEXTURE_BINDING_2D", "LOC_CUSTOM, TYPE_INT, TEXTURE_2D_INDEX, NO_EXTRA" ], [ "UNPACK_ALIGNMENT", "CONTEXT_INT(Unpack.Alignment), NO_EXTRA" ], - [ "VIEWPORT", "LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA" ], + [ "VIEWPORT", "LOC_CUSTOM, TYPE_FLOAT_4, 0, NO_EXTRA" ], # GL_ARB_multitexture [ "ACTIVE_TEXTURE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1d5dd4816a7..1231a6f4415 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1432,8 +1432,8 @@ struct gl_transform_attrib */ struct gl_viewport_attrib { - GLint X, Y; /**< position */ - GLsizei Width, Height; /**< size */ + GLfloat X, Y; /**< position */ + GLfloat Width, Height; /**< size */ GLdouble Near, Far; /**< Depth buffer range */ GLmatrix _WindowMap; /**< Mapping transformation as a matrix. */ }; |