---
src/gallium/drivers/r600/evergreen_hw_context.c | 16 ----------------
src/gallium/drivers/r600/r600_hw_context.c | 4 ++--
src/gallium/drivers/r600/r600_hw_context_priv.h | 1 +
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c
b/src/gallium/drivers/r600/evergreen_hw_context.c
index a58570e..bf6f422 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -648,22 +648,6 @@ static int evergreen_resource_range_init(struct
r600_context *ctx, struct r600_r
return r600_resource_init(ctx, range, offset, nblocks, stride,
r600_shader_resource, nreg, EVERGREEN_RESOURCE_OFFSET);
}
-/* SHADER SAMPLER R600/R700 */
-static int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset)
-{
- struct r600_reg r600_shader_sampler[] = {
- {R_03C000_SQ_TEX_SAMPLER_WORD0_0, 0, 0},
- {R_03C004_SQ_TEX_SAMPLER_WORD1_0, 0, 0},
- {R_03C008_SQ_TEX_SAMPLER_WORD2_0, 0, 0},
- };
- unsigned nreg = Elements(r600_shader_sampler);
-
- for (int i = 0; i < nreg; i++) {
- r600_shader_sampler[i].offset += offset;
- }
- return r600_context_add_block(ctx, r600_shader_sampler, nreg,
PKT3_SET_SAMPLER, EVERGREEN_SAMPLER_OFFSET);
-}
-
/* SHADER SAMPLER BORDER EG/CM */
static int evergreen_state_sampler_border_init(struct r600_context *ctx,
uint32_t offset, unsigned id)
{
diff --git a/src/gallium/drivers/r600/r600_hw_context.c
b/src/gallium/drivers/r600/r600_hw_context.c
index fb0923d..e73b609 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -574,8 +574,8 @@ static int r600_resource_range_init(struct r600_context
*ctx, struct r600_range
return r600_resource_init(ctx, range, offset, nblocks, stride,
r600_shader_resource, nreg, R600_RESOURCE_OFFSET);
}
-/* SHADER SAMPLER R600/R700 */
-static int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset)
+/* SHADER SAMPLER R600/R700/EG/CM */
+int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset)
{
struct r600_reg r600_shader_sampler[] = {
{R_03C000_SQ_TEX_SAMPLER_WORD0_0, 0, 0},
diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h
b/src/gallium/drivers/r600/r600_hw_context_priv.h
index c32fc63..7001890 100644
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -63,6 +63,7 @@ void r600_context_dirty_block(struct r600_context *ctx,
struct r600_block *block
int dirty, int index);
int r600_setup_block_table(struct r600_context *ctx);
int r600_resource_init(struct r600_context *ctx, struct r600_range *range,
unsigned offset, unsigned nblocks, unsigned stride, struct r600_reg *reg, int
nreg, unsigned offset_base);
+int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset);
/*
* evergreen_hw_context.c
--
1.7.5.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
