diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
| commit | 051645c92924bf915d82bf219f2ed67309b5577a (patch) | |
| tree | 4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/src/gallium/auxiliary/rbug | |
| parent | 2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff) | |
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/rbug')
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.c | 4 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.c b/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.c index ca0514735..3ee5e142b 100644 --- a/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.c +++ b/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.c @@ -283,9 +283,9 @@ int rbug_send_texture_info_reply(struct rbug_connection *__con, uint32_t format, uint32_t *width, uint32_t width_len, - uint32_t *height, + uint16_t *height, uint32_t height_len, - uint32_t *depth, + uint16_t *depth, uint32_t depth_len, uint32_t blockw, uint32_t blockh, diff --git a/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.h b/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.h index 59c914053..269e59611 100644 --- a/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.h +++ b/lib/mesa/src/gallium/auxiliary/rbug/rbug_texture.h @@ -166,9 +166,9 @@ int rbug_send_texture_info_reply(struct rbug_connection *__con, uint32_t format, uint32_t *width, uint32_t width_len, - uint32_t *height, + uint16_t *height, uint32_t height_len, - uint32_t *depth, + uint16_t *depth, uint32_t depth_len, uint32_t blockw, uint32_t blockh, |