fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/cs: Use override structure rather than separate env var

Browse source 
In 25268b93, we added a new environment variable
(INTEL_COMPUTE_SHADER) to allow some constant values to be upgraded
for the ARB_compute_shader extension.

Now, we can look to see if the extension was enabled via the
MESA_EXTENSION_OVERRIDE environment variable.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Jordan Justen 2014-06-08 00:05:37 -07:00
parent f5ca8c1972
commit 10e03b4401
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -34,6 +34,7 @@
#include "main/api_exec.h"
#include "main/context.h"
#include "main/fbobject.h"
#include "main/extensions.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/points.h"
@ -302,7 +303,7 @@ brw_initialize_context_constants(struct brw_context *brw)
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = max_samplers;
else
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = 0;
if (getenv("INTEL_COMPUTE_SHADER")) {
if (_mesa_extension_override_enables.ARB_compute_shader) {
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = BRW_MAX_TEX_UNIT;
ctx->Const.MaxUniformBufferBindings += 12;
} else {

3
src/mesa/drivers/dri/i965/intel_extensions.c
View file

@ -300,9 +300,6 @@ intelInitExtensions(struct gl_context *ctx)
*/
if (ctx->API == API_OPENGL_CORE)
ctx->Extensions.ARB_viewport_array = true;
if (getenv("INTEL_COMPUTE_SHADER"))
ctx->Extensions.ARB_compute_shader = true;
}
if (brw->gen >= 8) {