diff options
| author | Kenneth Graunke <[email protected]> | 2012-05-23 17:06:45 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-05-23 17:17:54 -0700 |
| commit | 88128516d43be5d25288ff5b64db63cda83c04b3 (patch) | |
| tree | 74a834b23b0f204d89a8c9299e94b7b574e96e51 /src/mesa/drivers/dri/i915 | |
| parent | d4667516b6f7ca7ebc8a2e74611c76643aff9a3f (diff) | |
i965: Gut the separate OpenGL ES extension enabling.
We should just set the bits of functionality that we support; the
GL/ES1/ES2 flags in extensions.c will take care of advertising the
appropriate extensions for the current API.
This enables the GL_EXT_texture_compression_dxt1 extension on ES1/ES2
when libtxc_dxtn is installed or the force_s3tc driconf option is set.
The main extension code set this up properly, but the ES-specific code
failed to do so.
Otherwise, the extension strings reported by es1_info, es2_info, and
glxinfo all remain the same.
This patch manually disables the ARB_framebuffer_object bit on ES
to preserve the behavior of 1c0f5d8324c4db2720247989ddc4a45315b55a85.
v2: Rebase, fix the i915 Makefile, and unconditionally set the
OES_draw_texture bit as core Mesa will only apply it to ES1 now.
Tested-by: Daniel Charles <[email protected]> [v1]
Reviewed-by: Chad Versace <[email protected]> [v1]
Signed-off-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.sources | 1 | ||||
| l--------- | src/mesa/drivers/dri/i915/intel_extensions_es.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources index 7dcf63d960f..9da2f396269 100644 --- a/src/mesa/drivers/dri/i915/Makefile.sources +++ b/src/mesa/drivers/dri/i915/Makefile.sources @@ -14,7 +14,6 @@ i915_C_FILES = \ intel_batchbuffer.c \ intel_clear.c \ intel_extensions.c \ - intel_extensions_es.c \ intel_mipmap_tree.c \ intel_resolve_map.c \ intel_tex_layout.c \ diff --git a/src/mesa/drivers/dri/i915/intel_extensions_es.c b/src/mesa/drivers/dri/i915/intel_extensions_es.c deleted file mode 120000 index 4924f7bdb4c..00000000000 --- a/src/mesa/drivers/dri/i915/intel_extensions_es.c +++ /dev/null @@ -1 +0,0 @@ -../intel/intel_extensions_es.c
\ No newline at end of file |