freedreno: Fix acc query handling in the presence of batch reordering.

[mesa.git] / src / gallium / drivers / freedreno / freedreno_program.h

diff --git a/src/gallium/drivers/freedreno/freedreno_program.h b/src/gallium/drivers/freedreno/freedreno_program.h
index e73cf1bbb97f512396021de62631ac29d67d83f6..306b449ee49eebce5e8b82ee483149099eca06fc 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_program.h
+++ b/src/gallium/drivers/freedreno/freedreno_program.h
@@ -1,7 +1,5 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
- * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
+ * Copyright (C) 2014 Rob Clark <robclark@freedesktop.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,51 +29,6 @@
 
 #include "pipe/p_context.h"
 
-#include "freedreno_context.h"
-
-#include "ir.h"
-#include "disasm.h"
-
-struct fd_shader_stateobj {
-       enum shader_t type;
-
-       uint32_t *bin;
-
-       struct tgsi_token *tokens;
-
-       /* note that we defer compiling shader until we know both vs and ps..
-        * and if one changes, we potentially need to recompile in order to
-        * get varying linkages correct:
-        */
-       struct ir_shader_info info;
-       struct ir_shader *ir;
-
-       /* for vertex shaders, the fetch instructions which need to be
-        * patched up before assembly:
-        */
-       unsigned num_vfetch_instrs;
-       struct ir_instruction *vfetch_instrs[64];
-
-       /* for all shaders, any tex fetch instructions which need to be
-        * patched before assembly:
-        */
-       unsigned num_tfetch_instrs;
-       struct {
-               unsigned samp_id;
-               struct ir_instruction *instr;
-       } tfetch_instrs[64];
-
-       unsigned first_immediate;     /* const reg # of first immediate */
-       unsigned num_immediates;
-       struct {
-               uint32_t val[4];
-       } immediates[64];
-};
-
-void fd_program_emit(struct fd_ringbuffer *ring,
-               struct fd_program_stateobj *prog);
-void fd_program_validate(struct fd_context *ctx);
-
 void fd_prog_init(struct pipe_context *pctx);
 void fd_prog_fini(struct pipe_context *pctx);