diff options
| author | Dave Airlie <[email protected]> | 2019-07-19 15:04:55 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-08-27 12:29:31 +1000 |
| commit | a1e8fcef47545db29950a6b2baf400dd0c6085a5 (patch) | |
| tree | db03606bea12db257c2bf2a4be152a71a9b111ad /src/gallium/auxiliary | |
| parent | e8a445d8b53e0c7c692325215404d413da1d9e30 (diff) | |
gallivm: move first/last level jit texture members.
This lets us create an image structure with the same basic
types as the texture one.
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 12 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index d4c89a85146..2bc924b6939 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -145,12 +145,6 @@ create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, depth, target, texture_type, DRAW_JIT_TEXTURE_DEPTH); - LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, first_level, - target, texture_type, - DRAW_JIT_TEXTURE_FIRST_LEVEL); - LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, last_level, - target, texture_type, - DRAW_JIT_TEXTURE_LAST_LEVEL); LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, base, target, texture_type, DRAW_JIT_TEXTURE_BASE); @@ -160,6 +154,12 @@ create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, img_stride, target, texture_type, DRAW_JIT_TEXTURE_IMG_STRIDE); + LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, first_level, + target, texture_type, + DRAW_JIT_TEXTURE_FIRST_LEVEL); + LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, last_level, + target, texture_type, + DRAW_JIT_TEXTURE_LAST_LEVEL); LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, mip_offsets, target, texture_type, DRAW_JIT_TEXTURE_MIP_OFFSETS); diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index 1556ea5c7ac..26ca32ff8d2 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -49,11 +49,11 @@ struct draw_jit_texture uint32_t width; uint32_t height; uint32_t depth; - uint32_t first_level; - uint32_t last_level; const void *base; uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS]; uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS]; + uint32_t first_level; + uint32_t last_level; uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS]; }; @@ -83,11 +83,11 @@ enum { DRAW_JIT_TEXTURE_WIDTH = 0, DRAW_JIT_TEXTURE_HEIGHT, DRAW_JIT_TEXTURE_DEPTH, - DRAW_JIT_TEXTURE_FIRST_LEVEL, - DRAW_JIT_TEXTURE_LAST_LEVEL, DRAW_JIT_TEXTURE_BASE, DRAW_JIT_TEXTURE_ROW_STRIDE, DRAW_JIT_TEXTURE_IMG_STRIDE, + DRAW_JIT_TEXTURE_FIRST_LEVEL, + DRAW_JIT_TEXTURE_LAST_LEVEL, DRAW_JIT_TEXTURE_MIP_OFFSETS, DRAW_JIT_TEXTURE_NUM_FIELDS /* number of fields above */ }; |