diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
| commit | b65fcab046d3a1b6b6ac315720df220925c5322e (patch) | |
| tree | ff73dcc383ac0799c655ff6194cda9dacb75dde9 /lib/mesa/src/gallium/auxiliary/rbug | |
| parent | 18d6381c51e253e4c41c62619f80d9ce745b95c8 (diff) | |
Merge Mesa 17.3.9
Mesa 18.x needs an ld with build-id for at least the intel code
Mesa 18.2 assumes linux only memfd syscalls in intel code
Tested by matthieu@, kettenis@ and myself on a variety of hardware and
architectures. ok kettenis@
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, |