Use a centralized packet framework

[gldbg.git] / flavors / gles2 / source / glwrap_funcs.c

diff --git a/flavors/gles2/source/glwrap_funcs.c b/flavors/gles2/source/glwrap_funcs.c
index c647753584930e4540739304de99070bd6bb84b3..e4f457abe6a5c7586832c660ca9a0bd9477cc4ec 100644 (file)
--- a/flavors/gles2/source/glwrap_funcs.c
+++ b/flavors/gles2/source/glwrap_funcs.c
@@ -10,12 +10,13 @@ Distributed under the GPL
 #include "functions.h"
 #include "glwrap.h"
 #include "opengl.h"
+#include "packet.h"
 
 GLenum cur_error = GL_NO_ERROR;
 
 static void check_error()
 {
-       GLenum (*orig_glGetError)() = 0;
+       GLenum (*orig_glGetError)() = NULL;
        GLenum code;
 
        if(!orig_glGetError)
@@ -24,9 +25,11 @@ static void check_error()
        code = orig_glGetError();
        if(code!=GL_NO_ERROR)
        {
-               begin_packet(FUNC_GLDERROR);
-               write_int(code);
-               send_packet();
+               GlPacket *pkt;
+
+               pkt = packet_begin(FUNC_GLDERROR);
+               packet_write_int(pkt, code);
+               packet_send(pkt, get_out_fd());
 
                if(cur_error==GL_NO_ERROR)
                        cur_error = code;
@@ -37,18 +40,20 @@ GLenum APIENTRY glGetError()
 {
        GLenum ret = cur_error;
        cur_error = GL_NO_ERROR;
+       GlPacket *pkt;
 
-       begin_packet(FUNC_GLGETERROR);
-       write_int(ret);
-       send_packet();
+       pkt = packet_begin(FUNC_GLGETERROR);
+       packet_write_int(pkt, ret);
+       packet_send(pkt, get_out_fd());
 
        return ret;
 }
 
 void (*eglGetProcAddress(const char *procname))(void)
 {
-       void *handle = 0;
-       void (*ret)() = 0;
+       void *handle = NULL;
+       void (*ret)() = NULL;
+       GlPacket *pkt;
 
        if(glsym((const char *)procname))
        {
@@ -56,10 +61,10 @@ void (*eglGetProcAddress(const char *procname))(void)
                ret = dlsym(handle, (const char *)procname);
        }
 
-       begin_packet(FUNC_EGLGETPROCADDRESS);
-       write_pointer(ret);
-       write_string((const char *)procname);
-       send_packet();
+       pkt = packet_begin(FUNC_EGLGETPROCADDRESS);
+       packet_write_pointer(pkt, ret);
+       packet_write_string(pkt, (const char *)procname);
+       packet_send(pkt, get_out_fd());
 
        return ret;
 }