Mesa (master): i965/fs: Remove the GL context from the generator
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Wed Apr 22 23:01:35 UTC 2015
Module: Mesa
Branch: master
Commit: 5cb91db619e8689c8fd45a67b57b96fc36f4ca9b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cb91db619e8689c8fd45a67b57b96fc36f4ca9b
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Wed Apr 15 14:51:18 2015 -0700
i965/fs: Remove the GL context from the generator
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/drivers/dri/i965/brw_fs.h | 1 -
src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 11 +----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 24ca43c..c429070 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -639,7 +639,6 @@ private:
bool patch_discard_jumps_to_fb_writes();
struct brw_context *brw;
- struct gl_context *ctx;
struct brw_compile *p;
const void * const key;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 3e103b2..539619a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -136,8 +136,6 @@ fs_generator::fs_generator(struct brw_context *brw,
runtime_check_aads_emit(runtime_check_aads_emit), debug_flag(false),
stage_abbrev(stage_abbrev), mem_ctx(mem_ctx)
{
- ctx = &brw->ctx;
-
p = rzalloc(mem_ctx, struct brw_compile);
brw_init_compile(brw->intelScreen->devinfo, p, mem_ctx);
}
@@ -2091,14 +2089,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
break;
default:
- if (inst->opcode < (int) ARRAY_SIZE(opcode_descs)) {
- _mesa_problem(ctx, "Unsupported opcode `%s' in %s",
- opcode_descs[inst->opcode].name, stage_abbrev);
- } else {
- _mesa_problem(ctx, "Unsupported opcode %d in %s", inst->opcode,
- stage_abbrev);
- }
- abort();
+ unreachable("Unsupported opcode");
case SHADER_OPCODE_LOAD_PAYLOAD:
unreachable("Should be lowered by lower_load_payload()");
More information about the mesa-commit
mailing list