Bump default memory allocation from 16 to 32 MiB

* add general texture image function
dmaivel · Jul 16, 2024 · 2fb69cc · 2fb69cc
1 parent f84d6a6
commit 2fb69cc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ options:
     -x                 remove shared memory file
     -g [MAJOR.MINOR]   report specific opengl version (default: 4.6)
     -r [WIDTHxHEIGHT]  set max resolution (default: 1920x1080)
-    -m [SIZE]          max amount of megabytes program may allocate (default: 16mib)
+    -m [SIZE]          max amount of megabytes program may allocate (default: 32mib)
     -p [PORT]          if networking is enabled, specify which port to use (default: 3000)
 ```
 

diff --git a/src/client/glimpl.c b/src/client/glimpl.c
@@ -904,6 +904,24 @@ static inline void glimpl_draw_elements(int mode, int type, int start, int end,
 
 #undef GET_MAX_INDEX
 
+static void glimpl_texture_image(int cmd, int n_dims, GLuint texture, GLint level, GLint internalformat,
+        GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
+{
+    const int dims[3] = { width, height, depth };
+
+    glimpl_upload_texture(width, n_dims > 1 ? height : 1, n_dims > 2 ? depth : 1, format, pixels);
+
+    pb_push(cmd);
+    pb_push(texture);
+    pb_push(level);
+    pb_push(internalformat);
+    for (int i = 0; i < n_dims; i++)
+        pb_push(dims[i]);
+    pb_push(border);
+    pb_push(format);
+    pb_push(type);
+}
+
 static void glimpl_texture_subimage(int cmd, int n_dims, GLuint texture, GLint level, GLint xoffset, GLint yoffset, 
         GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
@@ -1843,20 +1861,8 @@ void glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const G
 
 void glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void* pixels)
 {
-    glimpl_submit();
-
-    glimpl_upload_texture(width, 1, 1, internalformat, pixels);
-
-    pb_push(SGL_CMD_TEXIMAGE1D);
-    pb_push(target);
-    pb_push(level);
-    pb_push(internalformat);
-    pb_push(width);
-    pb_push(border);
-    pb_push(format);
-    pb_push(type);
-
-    glimpl_submit();
+    glimpl_texture_image(SGL_CMD_TEXIMAGE1D, 1, 
+            target, level, internalformat, width, 0, 0, border, format, type, pixels);
 }
 
 void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels)
@@ -1867,22 +1873,8 @@ void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, G
 
 void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels)
 {
-    glimpl_submit();
-
-    glimpl_upload_texture(width, height, depth, internalformat, pixels);
-
-    pb_push(SGL_CMD_TEXIMAGE3D);
-    pb_push(target);
-    pb_push(level);
-    pb_push(internalformat);
-    pb_push(width);
-    pb_push(height);
-    pb_push(depth);
-    pb_push(border);
-    pb_push(format);
-    pb_push(type);
-
-    glimpl_submit();
+    glimpl_texture_image(SGL_CMD_TEXIMAGE3D, 3, 
+            target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels)
@@ -1893,21 +1885,8 @@ void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
 
 void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels)
 {
-    glimpl_submit();
-
-    glimpl_upload_texture(width, height, 1, internalformat, pixels);
-
-    pb_push(SGL_CMD_TEXIMAGE2D);
-    pb_push(target);
-    pb_push(level);
-    pb_push(internalformat);
-    pb_push(width);
-    pb_push(height);
-    pb_push(border);
-    pb_push(format);
-    pb_push(type);
-
-    glimpl_submit();
+    glimpl_texture_image(SGL_CMD_TEXIMAGE2D, 2, 
+            target, level, internalformat, width, height, 0, border, format, type, pixels);
 }
 
 void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels)

diff --git a/src/server/main.c b/src/server/main.c
@@ -34,7 +34,7 @@ static const char *usage =
     "    -x                 remove shared memory file\n"
     "    -g [MAJOR.MINOR]   report specific opengl version (default: %d.%d)\n"
     "    -r [WIDTHxHEIGHT]  set max resolution (default: 1920x1080)\n"
-    "    -m [SIZE]          max amount of megabytes program may allocate (default: 16mib)\n"
+    "    -m [SIZE]          max amount of megabytes program may allocate (default: 32mib)\n"
     "    -p [PORT]          if networking is enabled, specify which port to use (default: 3000)\n";
 
 static void generate_virtual_machine_arguments(size_t m)
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
     int major = SGL_DEFAULT_MAJOR;
     int minor = SGL_DEFAULT_MINOR;
 
-    shm_size = 16;
+    shm_size = 32;
 
     signal(SIGSEGV, arg_parser_protector);