i965: Move up duplicated fields from stage-specific prog_data to brw_stage_prog_data.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_vec4_gs.c

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
index abc181ba445d40616f304cb50e73aceee7621668..73a873354092deb7ce736a310fd2644c1c810916 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
@@ -62,8 +62,10 @@ do_gs_prog(struct brw_context *brw,
    /* We also upload clip plane data as uniforms */
    param_count += MAX_CLIP_PLANES * 4;
 
-   c.prog_data.base.param = rzalloc_array(NULL, const float *, param_count);
-   c.prog_data.base.pull_param = rzalloc_array(NULL, const float *, param_count);
+   c.prog_data.base.base.param =
+      rzalloc_array(NULL, const float *, param_count);
+   c.prog_data.base.base.pull_param =
+      rzalloc_array(NULL, const float *, param_count);
 
    if (gp->program.OutputType == GL_POINTS) {
       /* When the output type is points, the geometry shader may output data
@@ -360,12 +362,12 @@ brw_gs_prog_data_compare(const void *in_a, const void *in_b)
    const struct brw_gs_prog_data *a = in_a;
    const struct brw_gs_prog_data *b = in_b;
 
-   /* Compare the base vec4 structure. */
-   if (!brw_vec4_prog_data_compare(&a->base, &b->base))
+   /* Compare the base structure. */
+   if (!brw_stage_prog_data_compare(&a->base.base, &b->base.base))
       return false;
 
    /* Compare the rest of the struct. */
-   const unsigned offset = sizeof(struct brw_vec4_prog_data);
+   const unsigned offset = sizeof(struct brw_stage_prog_data);
    if (memcmp(((char *) a) + offset, ((char *) b) + offset,
               sizeof(struct brw_gs_prog_data) - offset)) {
       return false;
@@ -373,12 +375,3 @@ brw_gs_prog_data_compare(const void *in_a, const void *in_b)
 
    return true;
 }
-
-
-void
-brw_gs_prog_data_free(const void *in_prog_data)
-{
-   const struct brw_gs_prog_data *prog_data = in_prog_data;
-
-   brw_vec4_prog_data_free(&prog_data->base);
-}