diff options
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index 963ac902d2..9af648b8d0 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -118,7 +118,7 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb, template.height[0] = height; template.depth[0] = 1; template.last_level = 0; - template.nr_samples = rb->Samples; + template.nr_samples = rb->NumSamples; if (pf_is_depth_stencil(template.format)) { template.tex_usage = PIPE_TEXTURE_USAGE_DEPTH_STENCIL; @@ -262,7 +262,7 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples) _mesa_init_renderbuffer(&strb->Base, 0); strb->Base.ClassID = 0x4242; /* just a unique value */ - strb->Base.Samples = samples; + strb->Base.NumSamples = samples; strb->format = format; switch (format) { diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 942f913ea2..ae71d586c2 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -541,9 +541,11 @@ st_draw_vbo(GLcontext *ctx, vp = ctx->st->vp; vs = &ctx->st->vp->state; +#if 0 if (MESA_VERBOSE & VERBOSE_GLSL) { check_uniforms(ctx); } +#endif /* * Setup the vbuffer[] and velements[] arrays. |