st/mesa/r200/i915/i965: eliminate gl_fragment_program

Here we move OriginUpperLeft and PixelCenterInteger into gl_program
all other fields have been replace by shader_info.

V2: Don't use anonymous union/structs to hold vertex/fragment fields
suggested by Ian.

Reviewed-by: Jason Ekstrand <[email protected]>

1 files changed, 2 insertions, 11 deletions

diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c
index 7118e79ae4d..49361bcbdf9 100644
--- a/src/compiler/shader_info.c
+++ b/src/compiler/shader_info.c
@@ -39,16 +39,7 @@ copy_shader_info(const struct gl_shader_program *shader_prog,
    info->system_values_read = sh->Program->SystemValuesRead;
    info->uses_texture_gather = sh->Program->UsesGather;
 
-   switch (sh->Stage) {
-   case MESA_SHADER_FRAGMENT: {
-      struct gl_fragment_program *fp =
-         (struct gl_fragment_program *)sh->Program;
-
-      info->fs.early_fragment_tests = sh->info.EarlyFragmentTests;
-      break;
-   }
-
-   default:
-      break; /* No stage-specific info */
+   if (sh->Stage == MESA_SHADER_FRAGMENT) {
+      sh->Program->info.fs.early_fragment_tests = sh->info.EarlyFragmentTests;
    }
 }