From: Eric Anholt <eric@anholt.net>
Date: Tue, 26 Jan 2010 20:43:43 +0000 (-0800)
Subject: swrast: Implement ARB_fragment_coord_conventions but don't enable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11c581c6ce0b09dc4203a7f93ebb8f76357f19be;p=mesa.git

swrast: Implement ARB_fragment_coord_conventions but don't enable.

This brings swrast's support up to the state of gallium, and fixes the
default center behavior of fragment.position.xy in piglit
fp-arb-fragment-coord-conventions-none.

The extension is not enabled currently because the GLSL part of the
extension isn't supported, so piglit
glsl-arb-fragment-coord-conventions-define fails as would any serious
test of the GLSL part.
---

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 9ac33a26a65..1c6492cc8fa 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -144,12 +144,22 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine,
              const struct gl_fragment_program *program,
              const SWspan *span, GLuint col)
 {
+   GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col];
+
    if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
       /* Clear temporary registers (undefined for ARB_f_p) */
       _mesa_bzero(machine->Temporaries,
                   MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
    }
 
+   /* ARB_fragment_coord_conventions */
+   if (program->OriginUpperLeft)
+      wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1];
+   if (!program->PixelCenterInteger) {
+      wpos[0] += 0.5;
+      wpos[1] += 0.5;
+   }
+
    /* Setup pointer to input attributes */
    machine->Attribs = span->array->attribs;