*
**********************************************************/
+#include "util/u_format.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "pipe/p_defines.h"
#include "util/u_math.h"
#include "svga_context.h"
+#include "svga_screen.h"
#include "svga_state.h"
#include "svga_cmd.h"
* to hardware. Simplest implementation would be to emit the whole of
* the "to" state.
*/
-static int emit_rss( struct svga_context *svga,
- unsigned dirty )
+static enum pipe_error
+emit_rss(struct svga_context *svga, unsigned dirty)
{
+ struct svga_screen *screen = svga_screen(svga->pipe.screen);
struct rs_queue queue;
+ float point_size_min;
queue.rs_count = 0;
if (svga->state.sw.need_pipeline)
cullmode = SVGA3D_FACE_NONE;
+ point_size_min = util_get_min_point_size(&curr->templ);
+
EMIT_RS( svga, cullmode, CULLMODE, fail );
EMIT_RS( svga, curr->scissortestenable, SCISSORTESTENABLE, fail );
EMIT_RS( svga, curr->multisampleantialias, MULTISAMPLEANTIALIAS, fail );
EMIT_RS( svga, curr->lastpixel, LASTPIXEL, fail );
- EMIT_RS( svga, curr->linepattern, LINEPATTERN, fail );
EMIT_RS_FLOAT( svga, curr->pointsize, POINTSIZE, fail );
- /* XXX still need to set this? */
- EMIT_RS_FLOAT( svga, 0.0, POINTSIZEMIN, fail );
- EMIT_RS_FLOAT( svga, SVGA_MAX_POINTSIZE, POINTSIZEMAX, fail );
+ EMIT_RS_FLOAT( svga, point_size_min, POINTSIZEMIN, fail );
+ EMIT_RS_FLOAT( svga, screen->maxPointSize, POINTSIZEMAX, fail );
EMIT_RS( svga, curr->pointsprite, POINTSPRITEENABLE, fail);
+
+ /* Emit line state, when the device understands it */
+ if (screen->haveLineStipple)
+ EMIT_RS( svga, curr->linepattern, LINEPATTERN, fail );
+ if (screen->haveLineSmooth)
+ EMIT_RS( svga, curr->antialiasedlineenable, ANTIALIASEDLINEENABLE, fail );
+ if (screen->maxLineWidth > 1.0F)
+ EMIT_RS_FLOAT( svga, curr->linewidth, LINEWIDTH, fail );
}
if (dirty & (SVGA_NEW_RAST | SVGA_NEW_FRAME_BUFFER | SVGA_NEW_NEED_PIPELINE))
EMIT_RS_FLOAT( svga, bias, DEPTHBIAS, fail );
}
- if (dirty & SVGA_NEW_CLIP) {
- /* the number of clip planes is how many planes to enable */
+ if (dirty & SVGA_NEW_FRAME_BUFFER) {
+ /* XXX: we only look at the first color buffer's sRGB state */
+ float gamma = 1.0f;
+ if (svga->curr.framebuffer.cbufs[0] &&
+ util_format_is_srgb(svga->curr.framebuffer.cbufs[0]->format)) {
+ gamma = 2.2f;
+ }
+ EMIT_RS_FLOAT(svga, gamma, OUTPUTGAMMA, fail);
+ }
+
+ if (dirty & SVGA_NEW_RAST) {
+ /* bitmask of the enabled clip planes */
unsigned enabled = svga->curr.rast->templ.clip_plane_enable;
EMIT_RS( svga, enabled, CLIPPLANEENABLE, fail );
}
SVGA_FIFOCommitAll( svga->swc );
}
- return 0;
+ return PIPE_OK;
fail:
/* XXX: need to poison cached hardware state on failure to ensure
(SVGA_NEW_BLEND |
SVGA_NEW_BLEND_COLOR |
- SVGA_NEW_CLIP |
SVGA_NEW_DEPTH_STENCIL |
SVGA_NEW_STENCIL_REF |
SVGA_NEW_RAST |