mesa: Add _mesa_error_no_memory for logging out-of-memory messages

This can be called from locations that don't have a context pointer
handy.  This patch also adds enough infrastructure so that the unit
tests for the GLSL compiler and the stand-alone compiler will build and
function.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index e12ba956d7a2a3987a01158acc2a92e85cbdbd93..fd0e837d11fa4e1daf014040cff4cb826c3e4ff1 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -62,7 +62,8 @@ tests_general_ir_test_SOURCES =               \
        tests/builtin_variable_test.cpp                 \
        tests/invalidate_locations_test.cpp             \
        tests/general_ir_test.cpp                       \
-       tests/varyings_test.cpp
+       tests/varyings_test.cpp                         \
+       tests/common.c
 tests_general_ir_test_CFLAGS =                         \
        $(PTHREAD_CFLAGS)
 tests_general_ir_test_LDADD =                          \
@@ -77,7 +78,8 @@ tests_uniform_initializer_test_SOURCES =              \
        $(top_srcdir)/src/mesa/program/symbol_table.c   \
        tests/copy_constant_to_storage_tests.cpp        \
        tests/set_uniform_initializer_tests.cpp         \
-       tests/uniform_initializer_utils.cpp
+       tests/uniform_initializer_utils.cpp             \
+       tests/common.c
 tests_uniform_initializer_test_CFLAGS =                        \
        $(PTHREAD_CFLAGS)
 tests_uniform_initializer_test_LDADD =                 \
@@ -96,7 +98,8 @@ tests_ralloc_test_LDADD =                             \
 tests_sampler_types_test_SOURCES =                     \
        $(top_srcdir)/src/mesa/program/prog_hash_table.c\
        $(top_srcdir)/src/mesa/program/symbol_table.c   \
-       tests/sampler_types_test.cpp
+       tests/sampler_types_test.cpp                    \
+       tests/common.c
 tests_sampler_types_test_CFLAGS =                      \
        $(PTHREAD_CFLAGS)
 tests_sampler_types_test_LDADD =                       \
@@ -139,6 +142,7 @@ glsl_test_SOURCES = \
        $(top_srcdir)/src/mesa/program/prog_hash_table.c \
        $(top_srcdir)/src/mesa/program/symbol_table.c \
        $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
+       tests/common.c \
        test.cpp \
        test_optpass.cpp
 

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 4ae8f0987d510405555a920764f8ff43c06780be..a4452e023f2a9e5ec5be67666c66185725352877 100644 (file)
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -40,6 +40,12 @@
 
 static int glsl_version = 330;
 
+extern "C" void
+_mesa_error_no_memory(const char *caller)
+{
+   fprintf(stderr, "Mesa error: out of memory in %s", caller);
+}
+
 static void
 initialize_context(struct gl_context *ctx, gl_api api)
 {

diff --git a/src/glsl/tests/common.c b/src/glsl/tests/common.c
new file mode 100644 (file)
index 0000000..d69f54d
--- /dev/null
+++ b/src/glsl/tests/common.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include <stdio.h>
+#include "main/errors.h"
+
+void
+_mesa_error_no_memory(const char *caller)
+{
+   fprintf(stderr, "Mesa error: out of memory in %s", caller);
+}

diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 30a86729873046c8619df4aafc569228188de740..aa0ff50ac3742df9e80ceadf3664c51150d09b14 100644 (file)
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -1414,6 +1414,12 @@ _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... )
    _mesa_record_error(ctx, error);
 }
 
+void
+_mesa_error_no_memory(const char *caller)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_OUT_OF_MEMORY, "out of memory in %s", caller);
+}
 
 /**
  * Report debug information.  Print error message to stderr via fprintf().

diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h
index 06d0b21fcae6e3161a6f9aa5b8cfeb6e87e201e2..b388138e84d611c69a317a9010710fe32660c701 100644 (file)
--- a/src/mesa/main/errors.h
+++ b/src/mesa/main/errors.h
@@ -63,6 +63,9 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTF
 extern void
 _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
 
+extern void
+_mesa_error_no_memory(const char *caller);
+
 extern void
 _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);