summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index d46091c9e6e..d220c79a8e4 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -48,7 +48,6 @@ extern "C" {
#include "../glsl/ir_optimization.h"
#include "../glsl/ir_print_visitor.h"
-static int using_new_fs = -1;
static struct brw_reg brw_reg_from_fs_reg(class fs_reg *reg);
struct gl_shader *
@@ -92,17 +91,10 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
{
struct intel_context *intel = intel_context(ctx);
- if (using_new_fs == -1) {
- if (intel->gen >= 6)
- using_new_fs = 1;
- else
- using_new_fs = getenv("INTEL_NEW_FS") != NULL;
- }
-
for (unsigned i = 0; i < prog->_NumLinkedShaders; i++) {
struct brw_shader *shader = (struct brw_shader *)prog->_LinkedShaders[i];
- if (using_new_fs && shader->base.Type == GL_FRAGMENT_SHADER) {
+ if (shader->base.Type == GL_FRAGMENT_SHADER) {
void *mem_ctx = talloc_new(NULL);
bool progress;
@@ -3190,9 +3182,6 @@ brw_wm_fs_emit(struct brw_context *brw, struct brw_wm_compile *c)
if (!prog)
return GL_FALSE;
- if (!using_new_fs)
- return GL_FALSE;
-
for (unsigned int i = 0; i < prog->_NumLinkedShaders; i++) {
if (prog->_LinkedShaders[i]->Type == GL_FRAGMENT_SHADER) {
shader = (struct brw_shader *)prog->_LinkedShaders[i];