replace _mesa_logbase2 with util_logbase2

[mesa.git] / src / mesa / state_tracker / st_atom_sampler.c

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 6d83f963f0aab52d792afb8063b43cecef579bf4..b74d47b691fed88ca8f981942bd97bb42fb6aa8d 100644 (file)
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -50,7 +50,7 @@
 
 #include "cso_cache/cso_context.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 
 /**
@@ -163,6 +163,9 @@ st_convert_sampler(const struct st_context *st,
       const GLboolean is_integer = texobj->_IsIntegerFormat;
       GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;
 
+      if (texobj->StencilSampling)
+         texBaseFormat = GL_STENCIL_INDEX;
+
       if (st->apply_texture_swizzle_to_border_color) {
          const struct st_texture_object *stobj = st_texture_object_const(texobj);
          /* XXX: clean that up to not use the sampler view at all */
@@ -258,13 +261,18 @@ update_shader_samplers(struct st_context *st,
    GLbitfield free_slots = ~prog->SamplersUsed;
    GLbitfield external_samplers_used = prog->ExternalSamplersUsed;
    unsigned unit, num_samplers;
+   struct pipe_sampler_state local_samplers[PIPE_MAX_SAMPLERS];
    const struct pipe_sampler_state *states[PIPE_MAX_SAMPLERS];
 
    if (samplers_used == 0x0) {
-      *out_num_samplers = 0;
+      if (out_num_samplers)
+         *out_num_samplers = 0;
       return;
    }
 
+   if (!samplers)
+      samplers = local_samplers;
+
    num_samplers = util_last_bit(samplers_used);
 
    /* loop over sampler units (aka tex image units) */
@@ -296,11 +304,16 @@ update_shader_samplers(struct st_context *st,
             st_get_texture_object(st->ctx, prog, unit);
       struct pipe_sampler_state *sampler = samplers + unit;
 
-      if (!stObj)
+      /* if resource format matches then YUV wasn't lowered */
+      if (!stObj || st_get_view_format(stObj) == stObj->pt->format)
          continue;
 
       switch (st_get_view_format(stObj)) {
       case PIPE_FORMAT_NV12:
+      case PIPE_FORMAT_P010:
+      case PIPE_FORMAT_P016:
+      case PIPE_FORMAT_YUYV:
+      case PIPE_FORMAT_UYVY:
          /* we need one additional sampler: */
          extra = u_bit_scan(&free_slots);
          states[extra] = sampler;
@@ -320,7 +333,9 @@ update_shader_samplers(struct st_context *st,
    }
 
    cso_set_samplers(st->cso_context, shader_stage, num_samplers, states);
-   *out_num_samplers = num_samplers;
+
+   if (out_num_samplers)
+      *out_num_samplers = num_samplers;
 }
 
 
@@ -332,8 +347,8 @@ st_update_vertex_samplers(struct st_context *st)
    update_shader_samplers(st,
                           PIPE_SHADER_VERTEX,
                           ctx->VertexProgram._Current,
-                          st->state.samplers[PIPE_SHADER_VERTEX],
-                          &st->state.num_samplers[PIPE_SHADER_VERTEX]);
+                          st->state.vert_samplers,
+                          &st->state.num_vert_samplers);
 }
 
 
@@ -345,9 +360,7 @@ st_update_tessctrl_samplers(struct st_context *st)
    if (ctx->TessCtrlProgram._Current) {
       update_shader_samplers(st,
                              PIPE_SHADER_TESS_CTRL,
-                             ctx->TessCtrlProgram._Current,
-                             st->state.samplers[PIPE_SHADER_TESS_CTRL],
-                             &st->state.num_samplers[PIPE_SHADER_TESS_CTRL]);
+                             ctx->TessCtrlProgram._Current, NULL, NULL);
    }
 }
 
@@ -360,9 +373,7 @@ st_update_tesseval_samplers(struct st_context *st)
    if (ctx->TessEvalProgram._Current) {
       update_shader_samplers(st,
                              PIPE_SHADER_TESS_EVAL,
-                             ctx->TessEvalProgram._Current,
-                             st->state.samplers[PIPE_SHADER_TESS_EVAL],
-                             &st->state.num_samplers[PIPE_SHADER_TESS_EVAL]);
+                             ctx->TessEvalProgram._Current, NULL, NULL);
    }
 }
 
@@ -375,9 +386,7 @@ st_update_geometry_samplers(struct st_context *st)
    if (ctx->GeometryProgram._Current) {
       update_shader_samplers(st,
                              PIPE_SHADER_GEOMETRY,
-                             ctx->GeometryProgram._Current,
-                             st->state.samplers[PIPE_SHADER_GEOMETRY],
-                             &st->state.num_samplers[PIPE_SHADER_GEOMETRY]);
+                             ctx->GeometryProgram._Current, NULL, NULL);
    }
 }
 
@@ -390,8 +399,8 @@ st_update_fragment_samplers(struct st_context *st)
    update_shader_samplers(st,
                           PIPE_SHADER_FRAGMENT,
                           ctx->FragmentProgram._Current,
-                          st->state.samplers[PIPE_SHADER_FRAGMENT],
-                          &st->state.num_samplers[PIPE_SHADER_FRAGMENT]);
+                          st->state.frag_samplers,
+                          &st->state.num_frag_samplers);
 }
 
 
@@ -403,8 +412,6 @@ st_update_compute_samplers(struct st_context *st)
    if (ctx->ComputeProgram._Current) {
       update_shader_samplers(st,
                              PIPE_SHADER_COMPUTE,
-                             ctx->ComputeProgram._Current,
-                             st->state.samplers[PIPE_SHADER_COMPUTE],
-                             &st->state.num_samplers[PIPE_SHADER_COMPUTE]);
+                             ctx->ComputeProgram._Current, NULL, NULL);
    }
 }