Module: Mesa
Branch: master
Commit: 59258498dc6fa51573b176d071644bd3e750b5ac
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=59258498dc6fa51573b176d071644bd3e750b5ac

Author: Brian Paul <[email protected]>
Date:   Thu Mar 25 16:03:13 2010 -0600

glapi: return int = 0 from NoOpGeneric()

If a GL function is called w/out a current rendering context, this stub
gets called.  It should return 0 so that non-void-valued functions return
0/NULL instead of a random number.

---

 src/mesa/glapi/glapi_nop.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c
index b1a718a..df9c587 100644
--- a/src/mesa/glapi/glapi_nop.c
+++ b/src/mesa/glapi/glapi_nop.c
@@ -93,7 +93,7 @@ NoOpUnused(void)
 
 #else
 
-static void
+static int
 NoOpGeneric(void)
 {
 #if !defined(_WIN32_WCE)
@@ -101,6 +101,7 @@ NoOpGeneric(void)
       fprintf(stderr, "GL User Error: calling GL function without a rendering 
context\n");
    }
 #endif
+   return 0;
 }
 
 #define TABLE_ENTRY(name) (_glapi_proc) NoOpGeneric

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to