i965: Use force_compat_profile driconf option

[mesa.git] / src / mesa / drivers / dri / i965 / brw_curbe.c

diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 2500dbd0c486df39a96c6327056f0d5a571dc5b3..abe8d099a19f820ab955c72ddb85288dd7746ee9 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -64,6 +64,7 @@
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "brw_util.h"
+#include "util/u_math.h"
 
 
 /**
@@ -86,7 +87,7 @@ static void calculate_curbe_offsets( struct brw_context *brw )
 
    /* _NEW_TRANSFORM */
    if (ctx->Transform.ClipPlanesEnabled) {
-      GLuint nr_planes = 6 + _mesa_bitcount(ctx->Transform.ClipPlanesEnabled);
+      GLuint nr_planes = 6 + util_bitcount(ctx->Transform.ClipPlanesEnabled);
       nr_clip_regs = (nr_planes * 4 + 15) / 16;
    }
 
@@ -195,6 +196,7 @@ static const GLfloat fixed_plane[6][4] = {
 static void
 brw_upload_constant_buffer(struct brw_context *brw)
 {
+   const struct gen_device_info *devinfo = &brw->screen->devinfo;
    struct gl_context *ctx = &brw->ctx;
    /* BRW_NEW_PUSH_CONSTANT_ALLOCATION */
    const GLuint sz = brw->curbe.total_size;
@@ -203,26 +205,32 @@ brw_upload_constant_buffer(struct brw_context *brw)
    GLuint i;
    gl_clip_plane *clip_planes;
 
+   /* BRW_NEW_FRAGMENT_PROGRAM */
+   struct gl_program *fp = brw->programs[MESA_SHADER_FRAGMENT];
+
+   /* BRW_NEW_VERTEX_PROGRAM */
+   struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX];
+
    if (sz == 0) {
       goto emit;
    }
 
-   buf = intel_upload_space(brw, bufsz, 64,
-                            &brw->curbe.curbe_bo, &brw->curbe.curbe_offset);
+   buf = brw_upload_space(&brw->upload, bufsz, 64,
+                          &brw->curbe.curbe_bo, &brw->curbe.curbe_offset);
 
    STATIC_ASSERT(sizeof(gl_constant_value) == sizeof(float));
 
    /* fragment shader constants */
    if (brw->curbe.wm_size) {
-      _mesa_load_state_parameters(ctx, brw->fragment_program->Parameters);
+      _mesa_load_state_parameters(ctx, fp->Parameters);
 
       /* BRW_NEW_PUSH_CONSTANT_ALLOCATION */
       GLuint offset = brw->curbe.wm_start * 16;
 
       /* BRW_NEW_FS_PROG_DATA | _NEW_PROGRAM_CONSTANTS: copy uniform values */
-      for (i = 0; i < brw->wm.base.prog_data->nr_params; i++) {
-        buf[offset + i] = *brw->wm.base.prog_data->param[i];
-      }
+      brw_populate_constant_data(brw, fp, &brw->wm.base, &buf[offset],
+                                 brw->wm.base.prog_data->param,
+                                 brw->wm.base.prog_data->nr_params);
    }
 
    /* clipper constants */
@@ -256,14 +264,14 @@ brw_upload_constant_buffer(struct brw_context *brw)
 
    /* vertex shader constants */
    if (brw->curbe.vs_size) {
-      _mesa_load_state_parameters(ctx, brw->vertex_program->Parameters);
+      _mesa_load_state_parameters(ctx, vp->Parameters);
 
       GLuint offset = brw->curbe.vs_start * 16;
 
       /* BRW_NEW_VS_PROG_DATA | _NEW_PROGRAM_CONSTANTS: copy uniform values */
-      for (i = 0; i < brw->vs.base.prog_data->nr_params; i++) {
-         buf[offset + i] = *brw->vs.base.prog_data->param[i];
-      }
+      brw_populate_constant_data(brw, vp, &brw->vs.base, &buf[offset],
+                                 brw->vs.base.prog_data->param,
+                                 brw->vs.base.prog_data->nr_params);
    }
 
    if (0) {
@@ -323,8 +331,8 @@ emit:
     *
     * BRW_NEW_FRAGMENT_PROGRAM
     */
-   if (brw->gen == 4 && !brw->is_g4x &&
-       (brw->fragment_program->info.inputs_read & (1 << VARYING_SLOT_POS))) {
+   if (devinfo->gen == 4 && !devinfo->is_g4x &&
+       (fp->info.system_values_read & (1ull << SYSTEM_VALUE_FRAG_COORD))) {
       BEGIN_BATCH(2);
       OUT_BATCH(_3DSTATE_GLOBAL_DEPTH_OFFSET_CLAMP << 16 | (2 - 2));
       OUT_BATCH(0);
@@ -346,4 +354,3 @@ const struct brw_tracked_state brw_constant_buffer = {
    },
    .emit = brw_upload_constant_buffer,
 };
-