diff options
| author | Chia-I Wu <[email protected]> | 2011-10-23 18:51:06 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-11-03 15:09:44 +0800 |
| commit | 2903816aadb281716b6c59a5a48aeadb84a08f50 (patch) | |
| tree | 23f372e51fdf5da3e37f3c3d8051458e340beed7 /src/glsl/builtins/tools | |
| parent | db73264e1471a594d49ca0bc397cbb6746ee1dce (diff) | |
glsl: add support for GL_OES_EGL_image_external
This extension introduces a new sampler type: samplerExternalOES.
texture2D (and texture2DProj) can be used to do a texture look up in an
external texture.
Reviewed-by: Brian Paul <[email protected]>
Acked-by: Jakob Bornecrantz <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/builtins/tools')
| -rwxr-xr-x | src/glsl/builtins/tools/generate_builtins.py | 1 | ||||
| -rwxr-xr-x | src/glsl/builtins/tools/texture_builtins.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py index b8c12bc3659..72d12bb2a9a 100755 --- a/src/glsl/builtins/tools/generate_builtins.py +++ b/src/glsl/builtins/tools/generate_builtins.py @@ -164,6 +164,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne st->symbols->language_version = 130; st->ARB_texture_rectangle_enable = true; st->EXT_texture_array_enable = true; + st->OES_EGL_image_external_enable = true; _mesa_glsl_initialize_types(st); sh->ir = new(sh) exec_list; diff --git a/src/glsl/builtins/tools/texture_builtins.py b/src/glsl/builtins/tools/texture_builtins.py index 7e569bf562b..62bad70ca26 100755 --- a/src/glsl/builtins/tools/texture_builtins.py +++ b/src/glsl/builtins/tools/texture_builtins.py @@ -23,6 +23,8 @@ def get_sampler_dim(sampler_type): sampler_dim = int(sampler_type[0]) elif sampler_type.startswith("Cube"): sampler_dim = 3 + elif sampler_type == "ExternalOES": + sampler_dim = 2 else: assert False ("coord_dim: invalid sampler_type: " + sampler_type) return sampler_dim @@ -480,6 +482,8 @@ def generate_texture_functions(fs): start_function("texture2D") generate_sigs("", "tex", "2D") generate_sigs("", "txb", "2D") + # OES_EGL_image_external + generate_sigs("", "tex", "ExternalOES") end_function(fs, "texture2D") start_function("texture2DLod") @@ -491,6 +495,9 @@ def generate_texture_functions(fs): generate_sigs("", "tex", "2D", Proj, 1) generate_sigs("", "txb", "2D", Proj) generate_sigs("", "txb", "2D", Proj, 1) + # OES_EGL_image_external + generate_sigs("", "tex", "ExternalOES", Proj) + generate_sigs("", "tex", "ExternalOES", Proj, 1) end_function(fs, "texture2DProj") start_function("texture2DProjLod") |