From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 2 Dec 2011 03:06:32 +0000 (+0800)
Subject: intel: add support for GL_OES_EGL_image_external
X-Git-Tag: android-x86-4.4-r1~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c505b6b604965603184d6e8fd870bd0566282503;p=android-x86%2Fexternal-mesa.git

intel: add support for GL_OES_EGL_image_external

The changes to i965 are untested.
---

diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c
index f186faca09d..796e4b8ec9c 100644
--- a/src/mesa/drivers/dri/i915/i830_texstate.c
+++ b/src/mesa/drivers/dri/i915/i830_texstate.c
@@ -335,6 +335,7 @@ i830UpdateTextureState(struct intel_context *intel)
       case TEXTURE_1D_BIT:
       case TEXTURE_2D_BIT:
       case TEXTURE_CUBE_BIT:
+      case TEXTURE_EXTERNAL_BIT:
          ok = i830_update_tex_unit(intel, i, TEXCOORDS_ARE_NORMAL);
          break;
       case TEXTURE_RECT_BIT:
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index b46a92a80d4..7ab135acbd2 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -259,7 +259,7 @@ translate_tex_src_target(struct i915_fragment_program *p, GLubyte bit)
    case TEXTURE_CUBE_INDEX:
       return D0_SAMPLE_TYPE_CUBE;
    case TEXTURE_EXTERNAL_INDEX:
-       return D0_SAMPLE_TYPE_2D;
+      return D0_SAMPLE_TYPE_2D;
    default:
       i915_program_error(p, "TexSrcBit: %d", bit);
       return 0;
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index a4f701b7320..3d70d997b68 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -83,6 +83,7 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.NV_texture_rectangle = true;
    ctx->Extensions.TDFX_texture_compression_FXT1 = true;
    ctx->Extensions.OES_EGL_image = true;
+   ctx->Extensions.OES_EGL_image_external = true;
    ctx->Extensions.OES_draw_texture = true;
    ctx->Extensions.OES_EGL_image_external = true;