**************************************************************************/
-#include "context.h"
-#include "colormac.h"
+#include "main/context.h"
#include "st_context.h"
-#include "softpipe/sp_context.h"
#include "st_atom.h"
-
-
-
-
+#include "pipe/p_context.h"
+#include "cso_cache/cso_context.h"
/**
* Update the viewport transformation matrix. Depends on:
* - depthrange
* - window pos/size or FBO size
*/
-static void update_viewport( struct st_context *st )
+static void
+update_viewport( struct st_context *st )
{
- GLcontext *ctx = st->ctx;
- const GLframebuffer *DrawBuffer = ctx->DrawBuffer;
- GLfloat yScale = 1.0;
- GLfloat yBias = 0.0;
+ struct gl_context *ctx = st->ctx;
+ GLfloat yScale, yBias;
/* _NEW_BUFFERS
*/
- if (DrawBuffer) {
-
-#if 0
- if (DrawBuffer->Name) {
- /* User created FBO */
- struct st_renderbuffer *irb
- = st_renderbuffer(DrawBuffer->_ColorDrawBuffers[0][0]);
- if (irb && !irb->RenderToTexture) {
- /* y=0=top */
- yScale = -1.0;
- yBias = irb->Base.Height;
- }
- else {
- /* y=0=bottom */
- yScale = 1.0;
- yBias = 0.0;
- }
- }
- else
- {
- /* window buffer, y=0=top */
- yScale = -1.0;
- yBias = DrawBuffer->Height;
- }
-#endif
+ if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
+ yScale = -1;
+ yBias = (GLfloat)ctx->DrawBuffer->Height;
+ }
+ else {
+ yScale = 1.0;
+ yBias = 0.0;
}
+ /* _NEW_VIEWPORT
+ */
{
- /* _NEW_VIEWPORT
- */
- GLfloat x = ctx->Viewport.X;
- GLfloat y = ctx->Viewport.Y;
+ GLfloat x = (GLfloat)ctx->Viewport.X;
+ GLfloat y = (GLfloat)ctx->Viewport.Y;
GLfloat z = ctx->Viewport.Near;
- GLfloat half_width = ctx->Viewport.Width / 2.0;
- GLfloat half_height = ctx->Viewport.Height / 2.0;
- GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
-
- struct softpipe_viewport vp;
+ GLfloat half_width = (GLfloat)ctx->Viewport.Width * 0.5f;
+ GLfloat half_height = (GLfloat)ctx->Viewport.Height * 0.5f;
+ GLfloat half_depth = (GLfloat)(ctx->Viewport.Far - ctx->Viewport.Near) * 0.5f;
- vp.scale[0] = half_width;
- vp.scale[1] = half_height * yScale;
- vp.scale[2] = half_depth;
- vp.scale[3] = 1.0;
+ st->state.viewport.scale[0] = half_width;
+ st->state.viewport.scale[1] = half_height * yScale;
+ st->state.viewport.scale[2] = half_depth;
+ st->state.viewport.scale[3] = 1.0;
- vp.translate[0] = (half_width + x);
- vp.translate[1] = (half_height + y) * yScale + yBias;
- vp.translate[2] = (half_depth + z);
- vp.translate[3] = 0.0;
+ st->state.viewport.translate[0] = half_width + x;
+ st->state.viewport.translate[1] = (half_height + y) * yScale + yBias;
+ st->state.viewport.translate[2] = half_depth + z;
+ st->state.viewport.translate[3] = 0.0;
- if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) {
- st->state.viewport = vp;
- st->softpipe->set_viewport(st->softpipe, &vp);
- }
+ cso_set_viewport(st->cso_context, &st->state.viewport);
}
}
const struct st_tracked_state st_update_viewport = {
- .dirty = {
- .mesa = _NEW_BUFFERS | _NEW_VIEWPORT,
- .st = 0,
+ "st_update_viewport", /* name */
+ { /* dirty */
+ _NEW_BUFFERS | _NEW_VIEWPORT, /* mesa */
+ 0, /* st */
},
- .update = update_viewport
+ update_viewport /* update */
};