Mesa (master): i965: Move brw_mark_surface_used() to brw_shader.cpp
Kristian Høgsberg
krh at kemper.freedesktop.org
Thu Oct 8 19:20:17 UTC 2015
Module: Mesa
Branch: master
Commit: cc4683992bf34fb09871e976abb8eebe7d68c3fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc4683992bf34fb09871e976abb8eebe7d68c3fe
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Tue Oct 6 16:11:08 2015 -0700
i965: Move brw_mark_surface_used() to brw_shader.cpp
brw_program.c won't be part of the compiler library, but we need
brw_mark_surface_used() in the compiler. Move to brw_shader.cpp.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Signed-off-by: Kristian Høgsberg Kristensen <krh at bitplanet.net>
---
src/mesa/drivers/dri/i965/brw_program.c | 10 ----------
src/mesa/drivers/dri/i965/brw_shader.cpp | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index a034dac..108eb34 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -531,16 +531,6 @@ brw_destroy_shader_time(struct brw_context *brw)
}
void
-brw_mark_surface_used(struct brw_stage_prog_data *prog_data,
- unsigned surf_index)
-{
- assert(surf_index < BRW_MAX_SURFACES);
-
- prog_data->binding_table.size_bytes =
- MAX2(prog_data->binding_table.size_bytes, (surf_index + 1) * 4);
-}
-
-void
brw_stage_prog_data_free(const void *p)
{
struct brw_stage_prog_data *prog_data = (struct brw_stage_prog_data *)p;
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 9ad7f3c..15f7393 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -164,6 +164,16 @@ brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
return &shader->base;
}
+void
+brw_mark_surface_used(struct brw_stage_prog_data *prog_data,
+ unsigned surf_index)
+{
+ assert(surf_index < BRW_MAX_SURFACES);
+
+ prog_data->binding_table.size_bytes =
+ MAX2(prog_data->binding_table.size_bytes, (surf_index + 1) * 4);
+}
+
enum brw_reg_type
brw_type_for_base_type(const struct glsl_type *type)
{
More information about the mesa-commit
mailing list