commit b22cb882e6550c8330786fbfbcff2348cdd3d1c1
author Cody Northrop <cody@lunarg.com> Fri Feb 13 09:08:43 2015 -0700
committer Cody Northrop <cody@lunarg.com> Tue Feb 17 14:20:42 2015 -0700
tree 1f81724bf14d6fd76b344cdf8ccc74b82fe63f69
parent 9e4d92846d85a7bb5794948c3690b1eb6a4b040a

Revert "compiler: Allow texture unit bindings to also set sampler index"

This reverts commit c33ac9267a70115c29f97eb20966de4c9aed6938.

icd/intel/compiler/shader/linker.cpp

diff --git a/icd/intel/compiler/shader/linker.cpp b/icd/intel/compiler/shader/linker.cpp
index fd23997..a55c7c6 100644
--- a/icd/intel/compiler/shader/linker.cpp
+++ b/icd/intel/compiler/shader/linker.cpp
@@ -2590,7 +2590,7 @@
       goto done;
 
    update_array_sizes(prog);
-   link_assign_uniform_locations(prog, ctx->API == API_XGL);
+   link_assign_uniform_locations(prog);
    link_assign_atomic_counter_resources(ctx, prog);
    store_fragdepth_layout(prog);