Mesa (glsl-pp-rework-2): slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.

Michał Król michal at kemper.freedesktop.org
Thu Dec 10 03:59:45 PST 2009


Module: Mesa
Branch: glsl-pp-rework-2
Commit: 48c60b0ecbc7d2f2b153d218a46c61928daddb8e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48c60b0ecbc7d2f2b153d218a46c61928daddb8e

Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:39:10 2009 +0100

slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.

They are no longer built into the glsl preprocessor.

---

 src/mesa/shader/slang/slang_compile.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index a194f2f..00db299 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2603,6 +2603,13 @@ compile_with_grammar(const char *source,
       return GL_FALSE;
    }
 
+   if (sl_pp_context_add_extension(context, "ARB_draw_buffers", "GL_ARB_draw_buffers") ||
+       sl_pp_context_add_extension(context, "ARB_texture_rectangle", "GL_ARB_texture_rectangle")) {
+      slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
+      sl_pp_context_destroy(context);
+      return GL_FALSE;
+   }
+
    memset(&options, 0, sizeof(options));
    if (sl_pp_tokenise(context, source, &options, &intokens)) {
       slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));



More information about the mesa-commit mailing list