URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=076ab157ff2ed7a98b09363bce355247f4ed71e6
Author: Timothy Arceri <[email protected]>
Date: Wed Nov 9 09:49:59 2016 +1100
st/mesa/glsl: move SamplerTargets to gl_program
This will help allow us to simplify the handling of samplers by
storing them in a single location rather than duplicating them in
both gl_linked_shader and gl_program.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=937523971f42f37b40badb962e575ecd8258b2d5
Author: Timothy Arceri <[email protected]>
Date: Wed Nov 9 10:00:09 2016 +1100
st/mesa/glsl: set SamplersUsed directly in gl_program
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=53a509723ff10ae1494e611de3823f17b7e9f225
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 17:05:22 2016 +1100
mesa/glsl: set sampler units directly in gl_program
Now that we create gl_program earlier there is no need to mess about
copying things to gl_linked_shader then to gl_program.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cc61cf706e857e27ea3ce9578b9c480bfbc94a1
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 16:41:30 2016 +1100
mesa: simplify sampler setting code
There is no need to loop over active samplers the code above this
would have already exited if the sampler was inactive, or errored
if the count was larger than the uniforms array size.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4807a83da0e0f5e3272e85504ee3b2213ef1910a
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 11:40:10 2016 +1100
mesa/glsl: set num_textures per stage directly in shader_info
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c46a630000a2539e38a448f24a456397ce201a2e
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 09:25:36 2016 +1100
mesa: make _CurrentFragmentProgram a gl_program struct pointer
Making this point to a gl_program struct rather than a gl_shader_program
struct will allow use to later also make the CurrentProgram array hold
gl_program structs which in turn will allow for code simpilifcation.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e3f6097c995a74d4ce52f542413b01ff819c203
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 16:04:01 2016 +1100
i965: stop passing gl_shader_program to the precompile and codegen functions
We no longer need it.
While we are at it we mark the vs, gs, and wm codegen functions as static.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ceedefd6c32fa31e6a35831a8a7a315e009ccc3
Author: Timothy Arceri <[email protected]>
Date: Wed Nov 9 23:50:07 2016 +1100
mesa/glsl: remove hack to reset sampler units to zero
Now that we have the is_arb_asm flag we can just skip the
initialisation.
V2: remove hack from standalone compiler where it was never
needed since it only compiles glsl shaders.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=238486884e74888d32d64ea9d934ba6b07e79eb2
Author: Timothy Arceri <[email protected]>
Date: Wed Nov 9 23:44:39 2016 +1100
i965: make use of new is_arb_asm flag
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f584f3821426955b94f36c77191edcfe1b1cc7d5
Author: Timothy Arceri <[email protected]>
Date: Wed Nov 9 23:38:46 2016 +1100
st/mesa/glsl: add new is_arb_asm flag in gl_program
Set the flag via the _mesa_init_gl_program() and NewProgram()
helpers.
In i965 we currently check for the existance of gl_shader_program
to decide if this is an ARB assembly style program or not.
Adding a flag makes the code clearer and will help removes a
dependency on gl_shader_program in the i965 codegen functions.
Also this will allow use to skip initialising sampler units for
linked shaders, we currently memset it to zero again during linking.
Reviewed-by: Eric Anholt <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2784128398e405405f0263d318ebe4121d1baf4c
Author: Timothy Arceri <[email protected]>
Date: Tue Nov 8 12:07:12 2016 +1100
i965: pass gl_program directly to brw_compile_tes()
This is the only thing we use from gl_shader_program so pass it directly.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a4d169735fd4b76d60963561ac6878c703338f9
Author: Timothy Arceri <[email protected]>
Date: Mon Nov 7 20:54:45 2016 +1100
i965: stop passing gl_shader_program to brw_nir_setup_glsl_uniforms()
We can now just get the data needed from the gl_shader_program_data
pointer in gl_program.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3b2ee6b4975bbb8eb960b20329461136a3e1a3f
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 23:35:11 2016 +1100
i965: pass gl_program to brw_upload_ubo_surfaces()
There is no need to pass gl_linked_shader anymore.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ca14f583c2613643671c1d5a8bd2b98745f4c7c
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 09:34:52 2016 +1100
i965: stop passing gl_shader_program to
brw_assign_common_binding_table_offsets()
We now get everything we need directly from gl_program so there is
no need for this.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5bc127b2f140213a8ceb58c4ed2d9b9a4c0449c
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 10:10:02 2016 +1100
st/mesa/glsl/i965: move ShaderStorageBlocks to gl_program
Having it here rather than in gl_linked_shader allows us to simplify
the code.
Also it is error prone to depend on the gl_linked_shader for programs
in current use because a failed linking attempt will free infomation
about the current program. In i965 we could be trying to recompile
a shader variant but may have lost some required fields.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f62eb6c7eb22cd97c691ebdb5f25eb5fe8e9ed11
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 09:24:51 2016 +1100
st/mesa/glsl/i965: set num_ssbos directly in shader_info
Here we also remove the duplicate field in gl_linked_shader and always
get the value from shader_info instead.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e7eec1ab5f27ced1aa4b2d77c2c63512d299694
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 08:55:57 2016 +1100
st/mesa/glsl/i965: move per stage UniformBlocks to gl_program
This will help allow us to store pointers to gl_program structs in the
CurrentProgram array resulting in a bunch of code simplifications.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b792c3897927c1d89968bc0040faef02ec976184
Author: Timothy Arceri <[email protected]>
Date: Sat Nov 5 08:44:22 2016 +1100
st/mesa/glsl/i965: set num_ubos directly in shader_info
This also removes the duplicate field in gl_linked_shader, and
gets num_ubos from shader_info instead.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1da57c19c27505b9eab4792355f2f1b5c774a0a
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 20:02:21 2016 +1100
st/mesa/glsl/i965: move ImageUnits and ImageAccess fields to gl_program
Having it here rather than in gl_linked_shader allows us to simplify
the code.
Also it is error prone to depend on the gl_linked_shader for programs
in current use because a failed linking attempt will free infomation
about the current program. In i965 we could be trying to recompile
a shader variant but may have lost some required fields.
We drop the memset on ImageUnits because gl_program is already
created using rzalloc().
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d2485f011c4f1c7de35871ca359a84415bfcc06
Author: Timothy Arceri <[email protected]>
Date: Mon Nov 7 17:08:23 2016 +1100
i965: get InfoLog and LinkStatus via the pointer in gl_program
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=be9a6a7eb77aa95154d4bd7876c37916a7ba9269
Author: Timothy Arceri <[email protected]>
Date: Mon Nov 7 16:43:39 2016 +1100
i965: get shared_size from shader_info rather than gl_shader_program
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=234211ec8ded86fbfc324068498629a9df769393
Author: Timothy Arceri <[email protected]>
Date: Mon Nov 7 11:43:47 2016 +1100
i965: stop depending on gl_shader_program for brw_compute_vue_map() params
This removes another dependency on gl_shader_program from the codegen
functions,
this will help allow us to use gl_program for the CurrentProgram array
rather
than gl_shader_program.
Reviewed-by: Lionel Landwerlin <[email protected]>
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f76ca300b2945ba8075b022aaec834fbc64af60
Author: Timothy Arceri <[email protected]>
Date: Fri Nov 4 14:09:35 2016 +1100
i965: pass gl_program to the brw_*_debug_recompile() functions
Rather then passing gl_shader_program.
The only field use was Name which is the same as the Id field in
gl_program.
For wm and vs we also make the functions static and move them before
the codegen functions.
This change reduces the codegen functions dependency on gl_shader_program.
Reviewed-by: Lionel Landwerlin <[email protected]>
_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
