Changeset 55013 in vbox

Timestamp:

Mar 30, 2015 5:03:12 PM (9 years ago)

Author:

vboxsync

Message:

Host 3D: crServer: move things in place: texture-related stuff -> server_texture.c.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_lists.c (modified) (3 diffs)
• server_texture.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c

@@ -281 +281 @@
 
 
-void SERVER_DISPATCH_APIENTRY crServerDispatchBindTexture( GLenum target, GLuint texture )
-{
-    crStateBindTexture( target, texture );
-    cr_server.head_spu->dispatch_table.BindTexture(target, crStateGetTextureHWID(texture));
-}
-
-void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteTextures( GLsizei n, const GLuint *textures)
-{
-    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
-    GLint i;
-
-    if (!newTextures)
-    {
-        crError("crServerDispatchDeleteTextures: out of memory");
-        return;
-    }
-
-    for (i = 0; i < n; i++)
-    {
-        newTextures[i] = crStateGetTextureHWID(textures[i]);
-    }
-
-//    for (i = 0; i < n; ++i)
-//    {
-//        crDebug("DeleteTexture: %d, pid %d, ctx %d", textures[i], (uint32_t)cr_server.curClient->pid, cr_server.currentCtxInfo->pContext->id);
-//    }
-
-
-    crStateDeleteTextures(n, textures);
-    cr_server.head_spu->dispatch_table.DeleteTextures(n, newTextures);
-    crFree(newTextures);
-}
-
-void SERVER_DISPATCH_APIENTRY crServerDispatchPrioritizeTextures( GLsizei n, const GLuint * textures, const GLclampf * priorities )
-{
-    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
-    GLint i;
-
-    if (!newTextures)
-    {
-        crError("crServerDispatchDeleteTextures: out of memory");
-        return;
-    }
-
-    crStatePrioritizeTextures(n, textures, priorities);
-
-    for (i = 0; i < n; i++)
-    {
-        newTextures[i] = crStateGetTextureHWID(textures[i]);
-    }
-
-    cr_server.head_spu->dispatch_table.PrioritizeTextures(n, newTextures, priorities);
-    crFree(newTextures);
-}
-
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteProgramsARB(GLsizei n, const GLuint * programs)
 {
@@ -352 +297 @@
 }
 
-/*@todo will fail for textures loaded from snapshot */
-GLboolean SERVER_DISPATCH_APIENTRY crServerDispatchIsTexture( GLuint texture )
-{
-    GLboolean retval;
-    retval = cr_server.head_spu->dispatch_table.IsTexture(crStateGetTextureHWID(texture));
-    crServerReturnValue( &retval, sizeof(retval) );
-    return retval; /* WILL PROBABLY BE IGNORED */
-}
-
 /*@todo will fail for progs loaded from snapshot */
 GLboolean SERVER_DISPATCH_APIENTRY crServerDispatchIsProgramARB( GLuint program )
@@ -368 +304 @@
     retval = cr_server.head_spu->dispatch_table.IsProgramARB( program );
     crServerReturnValue( &retval, sizeof(retval) );
-    return retval; /* WILL PROBABLY BE IGNORED */
-}
-
-GLboolean SERVER_DISPATCH_APIENTRY
-crServerDispatchAreTexturesResident(GLsizei n, const GLuint *textures,
-                                    GLboolean *residences)
-{
-    GLboolean retval;
-    GLsizei i;
-    GLboolean *res = (GLboolean *) crAlloc(n * sizeof(GLboolean));
-    GLuint *textures2 = (GLuint *) crAlloc(n * sizeof(GLuint));
-
-    (void) residences;
-        
-    for (i = 0; i < n; i++)
-    {
-        textures2[i] = crStateGetTextureHWID(textures[i]);
-    }
-    retval = cr_server.head_spu->dispatch_table.AreTexturesResident(n, textures2, res);
-
-    crFree(textures2);
-
-    crServerReturnValue(res, n * sizeof(GLboolean));
-
-    crFree(res);
-
     return retval; /* WILL PROBABLY BE IGNORED */
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c

@@ -21 +21 @@
 #include "server_dispatch.h"
 #include "server.h"
+#include "cr_mem.h"
 
 #define CR_NOTHING()
@@ -190 +191 @@
     crServerReturnValue( &(local_params[0]), crStateHlpComponentsCount(pname)*sizeof (GLint) );
 }
+
+void SERVER_DISPATCH_APIENTRY crServerDispatchBindTexture( GLenum target, GLuint texture )
+{
+    crStateBindTexture( target, texture );
+    cr_server.head_spu->dispatch_table.BindTexture(target, crStateGetTextureHWID(texture));
+}
+
+
+void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteTextures( GLsizei n, const GLuint *textures)
+{
+    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLint i;
+
+    if (!newTextures)
+    {
+        crError("crServerDispatchDeleteTextures: out of memory");
+        return;
+    }
+
+    for (i = 0; i < n; i++)
+    {
+        newTextures[i] = crStateGetTextureHWID(textures[i]);
+    }
+
+//    for (i = 0; i < n; ++i)
+//    {
+//        crDebug("DeleteTexture: %d, pid %d, ctx %d", textures[i], (uint32_t)cr_server.curClient->pid, cr_server.currentCtxInfo->pContext->id);
+//    }
+
+
+    crStateDeleteTextures(n, textures);
+    cr_server.head_spu->dispatch_table.DeleteTextures(n, newTextures);
+    crFree(newTextures);
+}
+
+
+void SERVER_DISPATCH_APIENTRY crServerDispatchPrioritizeTextures( GLsizei n, const GLuint * textures, const GLclampf * priorities )
+{
+    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLint i;
+
+    if (!newTextures)
+    {
+        crError("crServerDispatchDeleteTextures: out of memory");
+        return;
+    }
+
+    crStatePrioritizeTextures(n, textures, priorities);
+
+    for (i = 0; i < n; i++)
+    {
+        newTextures[i] = crStateGetTextureHWID(textures[i]);
+    }
+
+    cr_server.head_spu->dispatch_table.PrioritizeTextures(n, newTextures, priorities);
+    crFree(newTextures);
+}
+
+
+/*@todo will fail for textures loaded from snapshot */
+GLboolean SERVER_DISPATCH_APIENTRY crServerDispatchIsTexture( GLuint texture )
+{
+    GLboolean retval;
+    retval = cr_server.head_spu->dispatch_table.IsTexture(crStateGetTextureHWID(texture));
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+
+
+GLboolean SERVER_DISPATCH_APIENTRY
+crServerDispatchAreTexturesResident(GLsizei n, const GLuint *textures,
+                                    GLboolean *residences)
+{
+    GLboolean retval;
+    GLsizei i;
+    GLboolean *res = (GLboolean *) crAlloc(n * sizeof(GLboolean));
+    GLuint *textures2 = (GLuint *) crAlloc(n * sizeof(GLuint));
+
+    (void) residences;
+
+    for (i = 0; i < n; i++)
+    {
+        textures2[i] = crStateGetTextureHWID(textures[i]);
+    }
+    retval = cr_server.head_spu->dispatch_table.AreTexturesResident(n, textures2, res);
+
+    crFree(textures2);
+
+    crServerReturnValue(res, n * sizeof(GLboolean));
+
+    crFree(res);
+
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+