radeonsi: remove query/apply_opaque_metadata callbacks

[mesa.git] / src / gallium / drivers / radeonsi / si_pm4.c

diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index 2680439d35e3239e4f74f812403038205d0521f7..98aa94a4f5f1e84c529ab2a53bdc6578d9e6b422 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pm4.c
+++ b/src/gallium/drivers/radeonsi/si_pm4.c
@@ -19,9 +19,6 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Christian König <christian.koenig@amd.com>
  */
 
 #include "radeon/r600_cs.h"
@@ -45,8 +42,7 @@ void si_pm4_cmd_end(struct si_pm4_state *state, bool predicate)
        unsigned count;
        count = state->ndw - state->last_pm4 - 2;
        state->pm4[state->last_pm4] =
-               PKT3(state->last_opcode, count, predicate)
-                  | PKT3_SHADER_TYPE_S(state->compute_pkt);
+               PKT3(state->last_opcode, count, predicate);
 
        assert(state->ndw <= SI_PM4_MAX_DW);
 }
@@ -110,12 +106,6 @@ void si_pm4_clear_state(struct si_pm4_state *state)
        state->ndw = 0;
 }
 
-void si_pm4_free_state_simple(struct si_pm4_state *state)
-{
-       si_pm4_clear_state(state);
-       FREE(state);
-}
-
 void si_pm4_free_state(struct si_context *sctx,
                       struct si_pm4_state *state,
                       unsigned idx)
@@ -127,7 +117,8 @@ void si_pm4_free_state(struct si_context *sctx,
                sctx->emitted.array[idx] = NULL;
        }
 
-       si_pm4_free_state_simple(state);
+       si_pm4_clear_state(state);
+       FREE(state);
 }
 
 void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state)
@@ -150,7 +141,7 @@ void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state)
 
                radeon_emit(cs, PKT3(PKT3_INDIRECT_BUFFER_CIK, 2, 0));
                radeon_emit(cs, ib->gpu_address);
-               radeon_emit(cs, (ib->gpu_address >> 32) & 0xffff);
+               radeon_emit(cs, ib->gpu_address >> 32);
                radeon_emit(cs, (ib->b.b.width0 >> 2) & 0xfffff);
        }
 }