Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150505-1' into staging
sdl2: add opengl support
# gpg: Signature made Tue May 5 10:36:25 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-sdl-20150505-1:
sdl2: Fix RGB555
sdl2: add support for display rendering using opengl.
sdl2: move SDL_* includes to sdl2.h
console-gl: add opengl rendering helper functions
opengl: add shader helper functions.
opengl: add shader build infrastructure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index 224d2d1..617f67d 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -49,7 +49,7 @@
typedef uint32_t MemTxResult;
typedef uint64_t MemTxAttrs;
-static void __write(uint8_t *buf, ssize_t len)
+static void __bufwrite(uint8_t *buf, ssize_t len)
{
int first, last;
__coverity_negative_sink__(len);
@@ -59,7 +59,7 @@
__coverity_writeall__(buf);
}
-static void __read(uint8_t *buf, ssize_t len)
+static void __bufread(uint8_t *buf, ssize_t len)
{
__coverity_negative_sink__(len);
if (len == 0) return;
@@ -74,7 +74,7 @@
// TODO: investigate impact of treating reads as producing
// tainted data, with __coverity_tainted_data_argument__(buf).
- if (is_write) __write(buf, len); else __read(buf, len);
+ if (is_write) __bufread(buf, len); else __bufwrite(buf, len);
return result;
}
