freedreno: Fix warnings
Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
parent
c782168751
commit
e89683d5a2
|
@ -181,7 +181,7 @@ static void
|
||||||
fd5_launch_grid(struct fd_context *ctx, const struct pipe_grid_info *info)
|
fd5_launch_grid(struct fd_context *ctx, const struct pipe_grid_info *info)
|
||||||
{
|
{
|
||||||
struct fd5_compute_stateobj *so = ctx->compute;
|
struct fd5_compute_stateobj *so = ctx->compute;
|
||||||
struct ir3_shader_key key = {0};
|
struct ir3_shader_key key = {};
|
||||||
struct ir3_shader_variant *v;
|
struct ir3_shader_variant *v;
|
||||||
struct fd_ringbuffer *ring = ctx->batch->draw;
|
struct fd_ringbuffer *ring = ctx->batch->draw;
|
||||||
unsigned i, nglobal = 0;
|
unsigned i, nglobal = 0;
|
||||||
|
|
|
@ -211,7 +211,7 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc,
|
||||||
|
|
||||||
mtx_unlock(&ctx->screen->lock);
|
mtx_unlock(&ctx->screen->lock);
|
||||||
|
|
||||||
struct pipe_blit_info blit = {0};
|
struct pipe_blit_info blit = {};
|
||||||
blit.dst.resource = prsc;
|
blit.dst.resource = prsc;
|
||||||
blit.dst.format = prsc->format;
|
blit.dst.format = prsc->format;
|
||||||
blit.src.resource = pshadow;
|
blit.src.resource = pshadow;
|
||||||
|
@ -305,7 +305,7 @@ static void
|
||||||
fd_blit_from_staging(struct fd_context *ctx, struct fd_transfer *trans)
|
fd_blit_from_staging(struct fd_context *ctx, struct fd_transfer *trans)
|
||||||
{
|
{
|
||||||
struct pipe_resource *dst = trans->base.resource;
|
struct pipe_resource *dst = trans->base.resource;
|
||||||
struct pipe_blit_info blit = {0};
|
struct pipe_blit_info blit = {};
|
||||||
|
|
||||||
blit.dst.resource = dst;
|
blit.dst.resource = dst;
|
||||||
blit.dst.format = dst->format;
|
blit.dst.format = dst->format;
|
||||||
|
@ -325,7 +325,7 @@ static void
|
||||||
fd_blit_to_staging(struct fd_context *ctx, struct fd_transfer *trans)
|
fd_blit_to_staging(struct fd_context *ctx, struct fd_transfer *trans)
|
||||||
{
|
{
|
||||||
struct pipe_resource *src = trans->base.resource;
|
struct pipe_resource *src = trans->base.resource;
|
||||||
struct pipe_blit_info blit = {0};
|
struct pipe_blit_info blit = {};
|
||||||
|
|
||||||
blit.src.resource = src;
|
blit.src.resource = src;
|
||||||
blit.src.format = src->format;
|
blit.src.format = src->format;
|
||||||
|
@ -372,7 +372,7 @@ flush_resource(struct fd_context *ctx, struct fd_resource *rsc, unsigned usage)
|
||||||
fd_batch_reference(&write_batch, rsc->write_batch);
|
fd_batch_reference(&write_batch, rsc->write_batch);
|
||||||
|
|
||||||
if (usage & PIPE_TRANSFER_WRITE) {
|
if (usage & PIPE_TRANSFER_WRITE) {
|
||||||
struct fd_batch *batch, *batches[32] = {0};
|
struct fd_batch *batch, *batches[32] = {};
|
||||||
uint32_t batch_mask;
|
uint32_t batch_mask;
|
||||||
|
|
||||||
/* This is a bit awkward, probably a fd_batch_flush_locked()
|
/* This is a bit awkward, probably a fd_batch_flush_locked()
|
||||||
|
|
|
@ -445,14 +445,12 @@ struct ir3 {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct nir_register nir_register;
|
|
||||||
|
|
||||||
struct ir3_array {
|
struct ir3_array {
|
||||||
struct list_head node;
|
struct list_head node;
|
||||||
unsigned length;
|
unsigned length;
|
||||||
unsigned id;
|
unsigned id;
|
||||||
|
|
||||||
nir_register *r;
|
struct nir_register *r;
|
||||||
|
|
||||||
/* To avoid array write's from getting DCE'd, keep track of the
|
/* To avoid array write's from getting DCE'd, keep track of the
|
||||||
* most recent write. Any array access depends on the most
|
* most recent write. Any array access depends on the most
|
||||||
|
@ -470,13 +468,11 @@ struct ir3_array {
|
||||||
|
|
||||||
struct ir3_array * ir3_lookup_array(struct ir3 *ir, unsigned id);
|
struct ir3_array * ir3_lookup_array(struct ir3 *ir, unsigned id);
|
||||||
|
|
||||||
typedef struct nir_block nir_block;
|
|
||||||
|
|
||||||
struct ir3_block {
|
struct ir3_block {
|
||||||
struct list_head node;
|
struct list_head node;
|
||||||
struct ir3 *shader;
|
struct ir3 *shader;
|
||||||
|
|
||||||
const nir_block *nblock;
|
const struct nir_block *nblock;
|
||||||
|
|
||||||
struct list_head instr_list; /* list of ir3_instruction */
|
struct list_head instr_list; /* list of ir3_instruction */
|
||||||
|
|
||||||
|
|
|
@ -379,7 +379,7 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
while (n < argc) {
|
while (n < argc) {
|
||||||
char *filename = argv[n];
|
char *filename = argv[n];
|
||||||
char *ext = rindex(filename, '.');
|
char *ext = strrchr(filename, '.');
|
||||||
|
|
||||||
if (strcmp(ext, ".tgsi") == 0) {
|
if (strcmp(ext, ".tgsi") == 0) {
|
||||||
if (num_files != 0)
|
if (num_files != 0)
|
||||||
|
|
|
@ -345,8 +345,6 @@ struct ir3_shader_variant {
|
||||||
struct ir3_shader *shader;
|
struct ir3_shader *shader;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct nir_shader nir_shader;
|
|
||||||
|
|
||||||
struct ir3_shader {
|
struct ir3_shader {
|
||||||
enum shader_t type;
|
enum shader_t type;
|
||||||
|
|
||||||
|
@ -359,7 +357,7 @@ struct ir3_shader {
|
||||||
|
|
||||||
struct ir3_compiler *compiler;
|
struct ir3_compiler *compiler;
|
||||||
|
|
||||||
nir_shader *nir;
|
struct nir_shader *nir;
|
||||||
struct pipe_stream_output_info stream_output;
|
struct pipe_stream_output_info stream_output;
|
||||||
|
|
||||||
struct ir3_shader_variant *variants;
|
struct ir3_shader_variant *variants;
|
||||||
|
|
Loading…
Reference in New Issue