commit 3423488d55b9c483fcdb3996eb89b424c1031d24
author Timothy Arceri <timothy.arceri@collabora.com> Wed Oct 19 13:23:37 2016 +1100
committer Timothy Arceri <timothy.arceri@collabora.com> Wed Oct 26 14:29:36 2016 +1100
tree 270d90fe3fd4c090f2c8e59a3b20d0afe7d98e72
parent 17e28a1571b6141368fefc84cc8b0a3b4e52f8ee

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 <jason@jlekstrand.net>

src/mesa/program/arbprogparse.h

diff --git a/src/mesa/program/arbprogparse.h b/src/mesa/program/arbprogparse.h
index 05d93f0..1c39a45 100644
--- a/src/mesa/program/arbprogparse.h
+++ b/src/mesa/program/arbprogparse.h
@@ -29,8 +29,7 @@
 #include "main/glheader.h"
 
 struct gl_context;
-struct gl_fragment_program;
-struct gl_vertex_program;
+struct gl_program;
 
 extern void
 _mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target,
@@ -40,6 +39,6 @@
 extern void
 _mesa_parse_arb_fragment_program(struct gl_context *ctx, GLenum target,
                                  const GLvoid *str, GLsizei len,
-                                 struct gl_fragment_program *program);
+                                 struct gl_program *program);
 
 #endif