st/mesa/glsl: move Version to gl_shader_program_data
authorTimothy Arceri <timothy.arceri@collabora.com>
Wed, 9 Nov 2016 03:56:08 +0000 (14:56 +1100)
committerTimothy Arceri <timothy.arceri@collabora.com>
Fri, 2 Dec 2016 02:54:47 +0000 (13:54 +1100)
commitab8c01386ac1c832f3143f57091ed5cf9725c151
tree00ed2981f5dbe62cedb7c1fc7b51a59966036bca
parent534917495dca07bb63dbec49450c706fce36f176
st/mesa/glsl: move Version to gl_shader_program_data

This is mostly just used during linking however the st uses it
when updating textures.

In order to store gl_program in the CurrentProgram array
rather than gl_shader_program we need to move this field to
the shared gl_shader_program_data struct.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/compiler/glsl/link_interface_blocks.cpp
src/compiler/glsl/link_varyings.cpp
src/compiler/glsl/linker.cpp
src/mesa/main/mtypes.h
src/mesa/main/shaderapi.c
src/mesa/state_tracker/st_atom_texture.c