pyglet 3.0.dev8__tar.gz → 3.0.dev9__tar.gz

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyglet
-Version: 3.0.dev8
+Version: 3.0.dev9
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.10

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/doc/programming_guide/migration.rst

@@ -368,19 +368,19 @@ Previously to apply a state, your group might look like this::
             self.texture = texture
 
         def set_state(self):
-            glBindTexture(GL_TEXTURE_2D, self.texture.id)
+            glBindTexture(GL_TEXTURE_2D, self.texture.handle)
 
         def unset_state(self):
             # not required
 
         def __eq__(self, other):
             return (self.__class__ is other.__class__ and
-                    self.texture.id == other.texture.id and
+                    self.texture.key == other.texture.key and
                     self.texture.target == other.texture.target and
                     self.parent == other.parent)
 
         def __hash__(self):
-            return hash((self.texture.id, self.texture.target))
+            return hash((self.texture.key, self.texture.target))
 
 That same group with Pyglet 3.0 look like this::
 
@@ -422,6 +422,14 @@ Additional changes not covered above:
   ``Texture.blit_into`` was renamed to ``Texture.upload`` and
   ``Texture.get_image_data`` was renamed to ``Texture.fetch`` to better reflect that these involve GPU requests.
 
+* Graphics resource identities:
+  Backend-created resources such as textures, buffers, shaders, shader programs,
+  framebuffers, renderbuffers, and vertex arrays now separate their backend
+  ``handle`` from their stable pyglet ``key``. Use ``resource.handle`` when
+  passing a resource to a backend API, and ``resource.key`` for equality,
+  hashing, batching, or cache keys. The read-only ``resource.id`` alias is
+  deprecated; replace it with ``handle``.
+
 * Fonts and text:
   ``pyglet.font.manager`` now supports custom font-name callbacks,
   ``pyglet.font.get_custom_font_names`` was added, and ``pyglet.font.FontGroup``
@@ -434,6 +442,7 @@ Additional changes not covered above:
   ``Window.set_mouse_visible`` was renamed to
   ``Window.set_mouse_cursor_visible``, and ``Window.set_mouse_platform_visible``
   was renamed to ``Window.set_mouse_cursor_platform_visible``.
+  ``MouseCursor.gl_drawable`` was renamed to ``MouseCursor.api_drawable``.
 
 * ``pyglet.input``:
   Controllers now dispatch separate events for left/right sticks and

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/doc/programming_guide/rendering.rst

@@ -550,7 +550,7 @@ a texture requires the following before drawing::
 
     from pyglet.graphics.api.gl import *
     glActiveTexture(GL_TEXTURE0)
-    glBindTexture(texture.target, texture.id)
+    glBindTexture(texture.target, texture.handle)
 
 With a :py:class:`~pyglet.graphics.Group` these state changes can be
 encapsulated and associated with the vertex lists they affect.
@@ -566,7 +566,7 @@ and `Group.unset_state` methods to perform the required state changes::
         def set_state(self):
             self.program.use()
             glActiveTexture(GL_TEXTURE0)
-            glBindTexture(self.texture.target, self.texture.id)
+            glBindTexture(self.texture.target, self.texture.handle)
 
         def unset_state(self):
             self.program.stop()

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/doc/programming_guide/texture.rst

@@ -389,7 +389,7 @@ A :py:class:`~pyglet.graphics.texture.Texture` has a ``target`` and ``id``:
 ::
 
     from pyglet.graphics.api.gl import *
-    glBindTexture(texture.target, texture.id)
+    glBindTexture(texture.target, texture.handle)
 
 .. _OpenGL Programming Guide: http://www.opengl-redbook.com/
 

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/__init__.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '3.0.dev8'
+version = '3.0.dev9'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 10

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/experimental/geoshader_sprite.py

@@ -200,7 +200,7 @@ class SpriteGroup(graphics.Group):
         self.program.use()
 
         glActiveTexture(GL_TEXTURE0)
-        glBindTexture(self.texture.target, self.texture.id)
+        glBindTexture(self.texture.target, self.texture.handle)
 
         glEnable(GL_BLEND)
         glBlendFunc(self.blend_src, self.blend_dest)
@@ -217,13 +217,13 @@ class SpriteGroup(graphics.Group):
                 self.program is other.program and
                 self.parent == other.parent and
                 self.texture.target == other.texture.target and
-                self.texture.id == other.texture.id and
+                self.texture.key == other.texture.key and
                 self.blend_src == other.blend_src and
                 self.blend_dest == other.blend_dest)
 
     def __hash__(self):
         return hash((self.program, self.parent,
-                     self.texture.id, self.texture.target,
+                     self.texture.key, self.texture.target,
                      self.blend_src, self.blend_dest))
 
 
@@ -442,7 +442,7 @@ class Sprite(event.EventDispatcher):
             self._set_texture(img.get_texture())
 
     def _set_texture(self, texture):
-        if texture.id is not self._texture.id:
+        if texture.key != self._texture.key:
             self._group = self._group.__class__(texture,
                                                 self._group.blend_src,
                                                 self._group.blend_dest,

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/experimental/particles.py

@@ -319,7 +319,7 @@ class Emitter(event.EventDispatcher):
             self.dispatch_event('on_animation_end')
 
     def _set_texture(self, texture):
-        if texture.id is not self._texture.id:
+        if texture.key != self._texture.key:
             self._group = self._group.__class__(texture,
                                                 self._group.blend_src,
                                                 self._group.blend_dest,

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/__init__.py

@@ -40,6 +40,10 @@ if TYPE_CHECKING:
     from pyglet.graphics.state import State, Viewport, ViewportProtocol  # noqa: F401
     from pyglet.graphics.shader import get_default_shader  # noqa: F401
     from pyglet.graphics.buffer import UniformBufferRegion  # noqa: F401
+    from pyglet.graphics.resource import (  # noqa: F401
+        BufferKey, FramebufferKey, FramebufferResource, GraphicsResource, RenderbufferKey, RenderbufferResource,
+        ResourceKey, ShaderKey, ShaderProgramKey, TextureKey, VertexArrayKey, VertexArrayResource,
+    )
     from pyglet.graphics.draw import get_default_batch  # noqa: F401
     from pyglet.graphics.texture import PixelData, Texture, TextureGrid, Texture3D, TextureArray  # noqa: F401
     from pyglet.graphics.atlas import TextureBin, TextureArrayBin, TextureAtlas  # noqa: F401
@@ -58,6 +62,10 @@ else:
     from pyglet.graphics.state import State, Viewport, ViewportProtocol  # noqa: F401
     from pyglet.graphics.api import core  # noqa: F401
     from pyglet.graphics.buffer import UniformBufferRegion  # noqa: F401
+    from pyglet.graphics.resource import (  # noqa: F401
+        BufferKey, FramebufferKey, FramebufferResource, GraphicsResource, RenderbufferKey, RenderbufferResource,
+        ResourceKey, ShaderKey, ShaderProgramKey, TextureKey, VertexArrayKey, VertexArrayResource,
+    )
     from pyglet.graphics.texture import PixelData, Texture, TextureGrid, Texture3D, TextureArray  # noqa: F401
     from pyglet.graphics.atlas import TextureBin, TextureArrayBin, TextureAtlas  # noqa: F401
     from pyglet.graphics.framebuffer import Framebuffer, RenderTexture, Renderbuffer, TextureRenderTarget  # noqa: F401

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/api/__init__.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Sequence
 import pyglet
 
 from pyglet.enums import GraphicsAPI
-from pyglet.graphics.api.base import ResourceManagement, NullBackend
+from pyglet.graphics.api.base import NullBackend
 
 if TYPE_CHECKING:
     from pyglet.graphics.api.base import GraphicsConfig
@@ -14,8 +14,6 @@ if TYPE_CHECKING:
 
 core = NullBackend()
 
-resource_manager = ResourceManagement()
-
 
 # Enforce WebGL if emscripten is detected.
 # Create better fallback/choosing system later.

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/api/base.py

@@ -13,7 +13,6 @@ from pyglet.util import debug_print
 
 if TYPE_CHECKING:
     from pyglet.config import SurfaceConfig
-    from pyglet.graphics.api.gl import ObjectSpace
     from pyglet.graphics.buffer import BufferRange
     from pyglet.window import Window
 
@@ -35,11 +34,6 @@ class BackendGlobalObject(ABC):  # Temp name for now.
     def have_context(self) -> bool:
         return self._have_context
 
-    @property
-    @abstractmethod
-    def object_space(self) -> ObjectSpace:
-        ...
-
     @abstractmethod
     def get_surface_context(
             self,
@@ -111,10 +105,6 @@ class NullBackend(BackendGlobalObject):  # noqa: D101
     def _raise_no_backend(self) -> NoReturn:
         raise UnavailableBackendError
 
-    @property
-    def object_space(self) -> ObjectSpace:
-        self._raise_no_backend()
-
     def get_surface_context(self, window: Window, config: SurfaceConfig,
                             shared: SurfaceContext | None = None) -> SurfaceContext:
         self._raise_no_backend()
@@ -613,61 +603,3 @@ class GraphicsConfig:
     def user_set_attributes(self) -> set[str]:
         """Return a set of attribute names that were explicitly set by the user."""
         return self._user_set_attributes
-
-
-class GraphicsResource(Protocol):  # noqa: D101
-    def delete(self) -> None:
-        ...
-
-
-class ResourceManagement:
-    """A manager to handle the freeing of resources for an API.
-
-    In some graphical API's, the order in which you free resources can be very specific.
-    """
-    managers: list[GraphicsResource]
-    weak_resources: weakref.WeakSet[GraphicsResource]
-
-    def __init__(self) -> None:  # noqa: D107
-        self._func = None
-        self.managers = []
-        self.weak_resources = weakref.WeakSet()
-        atexit.register(self.on_exit_cleanup)
-
-    def set_pre_cleanup_func(self, func: Callable) -> None:
-        """Register a function to be called before cleanup.
-
-        Some API's may need to enforce a sync before cleanup.
-        """
-        self._func = func
-
-    def register_manager(self, resource: GraphicsResource) -> None:
-        """A manager handles multiple resources, these will be called in reverse order on cleanup."""
-        self.managers.append(resource)
-
-    def register_resource(self, resource: GraphicsResource) -> None:
-        """Registers a resource as a weak reference.
-
-        Some resources do not have a manager, but they do need to be freed before others. Keeping them permanently
-        may prevent them from being garbage collected prior to shutdown.
-        """
-        self.weak_resources.add(resource)
-
-    def on_exit_cleanup(self) -> None:
-        """Cleans up all graphical resources that have been registered on application exit."""
-        self.cleanup_all()
-
-    def cleanup_all(self) -> None:
-        """Cleans up all graphical resources that have been registered.
-
-        Weak resources registered are destroyed first.
-
-        Managers are called last, and in reverse order of registered.
-        """
-        if self._func:
-            self._func()
-
-        for resource in self.weak_resources:
-            resource.delete()
-        for resource in reversed(self.managers):
-            resource.delete()

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/api/gl/__init__.py

@@ -52,7 +52,7 @@ import pyglet as _pyglet
 from pyglet import compat_platform
 from pyglet.graphics.api.gl.gl import *  # Must always be imported before gl_info or bad things happen.  # noqa: F403
 from pyglet.graphics.api.gl.lib import GLException  # noqa: F401
-from .base import ObjectSpace  # noqa: F401
+from .base import GLSharedObjectSpace  # noqa: F401
 from .context import OpenGLSurfaceContext
 
 _is_pyglet_doc_run = hasattr(_sys, "is_pyglet_doc_run") and _sys.is_pyglet_doc_run

pyglet-3.0.dev9/pyglet/graphics/api/gl/base.py

@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pyglet.graphics.api.gl.context import OpenGLSurfaceContext
+
+
+class GLSharedObjectSpace:
+    """Queues OpenGL objects for deletion by any context in a share group."""
+
+    def __init__(self) -> None:  # noqa: D107
+        self._textures: list[int] = []
+        self._buffers: list[int] = []
+        self._shader_programs: list[int] = []
+        self._shaders: list[int] = []
+        self._renderbuffers: list[int] = []
+
+    def defer_texture(self, texture_id: int) -> None:
+        self._textures.append(texture_id)
+
+    def defer_buffer(self, buffer_id: int) -> None:
+        self._buffers.append(buffer_id)
+
+    def defer_shader_program(self, program_id: int) -> None:
+        self._shader_programs.append(program_id)
+
+    def defer_shader(self, shader_id: int) -> None:
+        self._shaders.append(shader_id)
+
+    def defer_renderbuffer(self, renderbuffer_id: int) -> None:
+        self._renderbuffers.append(renderbuffer_id)
+
+    def flush(self, context: OpenGLSurfaceContext) -> None:
+        """Delete queued objects using a current context in this share group."""
+        if self._textures:
+            context._delete_objects(self._textures, context.glDeleteTextures)  # noqa: SLF001
+        if self._buffers:
+            context._delete_objects(self._buffers, context.glDeleteBuffers) # noqa: SLF001
+        if self._shader_programs:
+            context._delete_objects_one_by_one(self._shader_programs, context.glDeleteProgram) # noqa: SLF001
+        if self._shaders:
+            context._delete_objects_one_by_one(self._shaders, context.glDeleteShader) # noqa: SLF001
+        if self._renderbuffers:
+            context._delete_objects(self._renderbuffers, context.glDeleteRenderbuffers) # noqa: SLF001
+
+
+class ContextException(Exception):
+    pass
+
+
+class ConfigException(Exception):
+    pass
+
+

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/api/gl/buffer.py

@@ -56,7 +56,7 @@ class GLBufferObject(AbstractBuffer):
     This class intentionally treats data as bytes for GPU transfer.
     """
 
-    id: int | None
+    handle: int | None
     usage: int
     target: int
 
@@ -81,7 +81,7 @@ class GLBufferObject(AbstractBuffer):
 
         buffer_id = GLuint()
         self._context.glGenBuffers(1, buffer_id)
-        self.id = buffer_id.value
+        self._handle = buffer_id.value
         self._allocated = False
         self._data_uploaded = False
 
@@ -92,7 +92,7 @@ class GLBufferObject(AbstractBuffer):
         )
 
     def bind(self) -> None:
-        self._context.glBindBuffer(self.target, self.id)
+        self._context.glBindBuffer(self.target, self._handle)
 
     def unbind(self) -> None:
         self._context.glBindBuffer(self.target, 0)
@@ -154,18 +154,18 @@ class GLBufferObject(AbstractBuffer):
         self._data_uploaded = False
 
     def delete(self) -> None:
-        if self.id is None:
+        if self._handle is None:
             return
-        self._context.glDeleteBuffers(1, GLuint(self.id))
-        self.id = None
+        self._context.glDeleteBuffers(1, GLuint(self._handle))
+        self._handle = None
         self._allocated = False
         self._data_uploaded = False
 
     def __del__(self) -> None:
-        if self.id is not None:
+        if self._handle is not None:
             try:
-                self._context.delete_buffer(self.id)
-                self.id = None
+                self._context.delete_buffer(self._handle)
+                self._handle = None
             except (AttributeError, ImportError):
                 pass  # Interpreter is shutting down
 
@@ -196,7 +196,7 @@ class GLBufferObject(AbstractBuffer):
         self._allocated = True
 
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(id={self.id}, size={self.size})"
+        return f"{self.__class__.__name__}(handle={self._handle}, size={self.size})"
 
 
 class GLMappedBufferObject(GLBufferObject, BaseMappedBufferObject):
@@ -398,7 +398,7 @@ class GLIndexedBufferObject(GLBackedBufferObject):
         )
 
     def bind_to_index_buffer(self) -> None:
-        self._context.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, self.id)
+        self._context.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, self._handle)
 
 
 class GLPixelBufferObject(GLBufferObject, PixelBuffer):
@@ -463,13 +463,13 @@ class GLTransformFeedbackBufferObject(GLBufferObject, TransformFeedbackBuffer):
 
     def bind_base(self, index: int) -> None:
         self._ensure_allocated()
-        self._context.glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, index, self.id)
+        self._context.glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, index, self._handle)
         self._data_uploaded = True
 
     def bind_range(self, index: int, offset: int, size: int) -> None:
         self._validate_byte_range(offset, size)
         self._ensure_allocated()
-        self._context.glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, index, self.id, offset, size)
+        self._context.glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, index, self._handle, offset, size)
         self._data_uploaded = True
 
 
@@ -524,7 +524,7 @@ class GLUniformBufferObject(UniformBufferObject):
         return GLBufferObject(context, buffer_size, target=GL_UNIFORM_BUFFER)
 
     def _bind_range(self, binding: int, offset: int, size: int) -> None:
-        self._context.glBindBufferRange(GL_UNIFORM_BUFFER, binding, self.buffer.id, offset, size)
+        self._context.glBindBufferRange(GL_UNIFORM_BUFFER, binding, self.buffer.handle, offset, size)
 
 class PersistentBufferObject(BaseMappedBufferObject):
     """A persistently mapped OpenGL buffer.
@@ -533,7 +533,7 @@ class PersistentBufferObject(BaseMappedBufferObject):
     and remains mapped for the buffer lifetime.
     """
 
-    id: int | None
+    handle: int | None
     target: int
     usage: int
     flags: int
@@ -564,7 +564,7 @@ class PersistentBufferObject(BaseMappedBufferObject):
         self.data_type = graphics_attr.attribute.fmt.data_type
         self.flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT
 
-        self.id = None
+        self._handle = None
         self.store = None
         self._mapped = None
         self._mapped_ptr = 0
@@ -600,8 +600,8 @@ class PersistentBufferObject(BaseMappedBufferObject):
         if preserve:
             ctypes.memmove(new_ptr, preserve, len(preserve))
 
-        old_id = self.id
-        self.id = new_id
+        old_id = self._handle
+        self._handle = new_id
         self.size = size
         self._mapped = new_mapped
         self._mapped_ptr = new_ptr
@@ -643,7 +643,7 @@ class PersistentBufferObject(BaseMappedBufferObject):
         return self._require_store().element_size
 
     def bind(self) -> None:
-        self._context.glBindBuffer(self.target, self.id)
+        self._context.glBindBuffer(self.target, self._handle)
 
     def unbind(self) -> None:
         self._context.glBindBuffer(self.target, 0)
@@ -684,20 +684,20 @@ class PersistentBufferObject(BaseMappedBufferObject):
         return
 
     def delete(self) -> None:
-        if self.id is None:
+        if self._handle is None:
             return
-        self._context.glDeleteBuffers(1, GLuint(self.id))
-        self.id = None
+        self._context.glDeleteBuffers(1, GLuint(self._handle))
+        self._handle = None
         self._mapped = None
         self._mapped_ptr = 0
         self._storage_size = 0
         self.get_region.cache_clear()
 
     def __del__(self) -> None:
-        if self.id is not None:
+        if self._handle is not None:
             try:
-                self._context.delete_buffer(self.id)
-                self.id = None
+                self._context.delete_buffer(self._handle)
+                self._handle = None
             except (AttributeError, ImportError):
                 pass  # Interpreter is shutting down
 

{pyglet-3.0.dev8 → pyglet-3.0.dev9}/pyglet/graphics/api/gl/context.py

@@ -5,7 +5,8 @@ import weakref
 from typing import Callable, TYPE_CHECKING
 
 from pyglet.graphics import GraphicsAPIError, GraphicsIntegrationError
-from pyglet.graphics.api.gl import gl, gl_info, ObjectSpace
+from pyglet.graphics.api.gl import gl, gl_info
+from pyglet.graphics.api.gl.base import GLSharedObjectSpace
 from pyglet.graphics.api.base import SurfaceContext, NullContext
 from pyglet.graphics.api.gl.gl import (
     GL_ALREADY_SIGNALED,
@@ -43,7 +44,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
     _info: gl_info.GLInfo
 
     #: A container which is shared between all contexts that share GL objects.
-    object_space: ObjectSpace
+    object_space: GLSharedObjectSpace
     config: SurfaceConfig
     context_share: OpenGLSurfaceContext | None
 
@@ -75,7 +76,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if context_share:
             self.object_space = context_share.object_space
         else:
-            self.object_space = ObjectSpace()
+            self.object_space = GLSharedObjectSpace()
 
         self.cached_programs = weakref.WeakValueDictionary()
         self.renderer = GLRenderer(self)
@@ -177,17 +178,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
             self.uniform_getters, self.uniform_setters = self._get_uniform_func_tables()
             self._info.query(self)
 
-        if self.object_space.doomed_textures:
-            self._delete_objects(self.object_space.doomed_textures, self.glDeleteTextures)
-        if self.object_space.doomed_buffers:
-            self._delete_objects(self.object_space.doomed_buffers, self.glDeleteBuffers)
-        if self.object_space.doomed_shader_programs:
-            self._delete_objects_one_by_one(self.object_space.doomed_shader_programs,
-                                            self.glDeleteProgram)
-        if self.object_space.doomed_shaders:
-            self._delete_objects_one_by_one(self.object_space.doomed_shaders, self.glDeleteShader)
-        if self.object_space.doomed_renderbuffers:
-            self._delete_objects(self.object_space.doomed_renderbuffers, self.glDeleteRenderbuffers)
+        self.object_space.flush(self)
 
         if self.doomed_vaos:
             self._delete_objects(self.doomed_vaos, self.glDeleteVertexArrays)
@@ -273,7 +264,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if self._safe_to_operate_on_object_space():
             self.glDeleteTextures(1, GLuint(texture_id))
         else:
-            self.object_space.doomed_textures.append(texture_id)
+            self.object_space.defer_texture(texture_id)
 
     def delete_buffer(self, buffer_id: int) -> None:
         """Safely delete a Buffer belonging to this context's object space.
@@ -284,7 +275,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if self._safe_to_operate_on_object_space():
             self.glDeleteBuffers(1, GLuint(buffer_id))
         else:
-            self.object_space.doomed_buffers.append(buffer_id)
+            self.object_space.defer_buffer(buffer_id)
 
     def delete_shader_program(self, program_id: int) -> None:
         """Safely delete a ShaderProgram belonging to this context's object space.
@@ -295,7 +286,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if self._safe_to_operate_on_object_space():
             self.glDeleteProgram(GLuint(program_id))
         else:
-            self.object_space.doomed_shader_programs.append(program_id)
+            self.object_space.defer_shader_program(program_id)
 
     def delete_shader(self, shader_id: int) -> None:
         """Safely delete a Shader belonging to this context's object space.
@@ -306,7 +297,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if self._safe_to_operate_on_object_space():
             self.glDeleteShader(GLuint(shader_id))
         else:
-            self.object_space.doomed_shaders.append(shader_id)
+            self.object_space.defer_shader(shader_id)
 
     def delete_renderbuffer(self, rbo_id: int) -> None:
         """Safely delete a Renderbuffer belonging to this context's object space.
@@ -317,7 +308,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
         if self._safe_to_operate_on_object_space():
             self.glDeleteRenderbuffers(1, GLuint(rbo_id))
         else:
-            self.object_space.doomed_renderbuffers.append(rbo_id)
+            self.object_space.defer_renderbuffer(rbo_id)
 
     def delete_vao(self, vao_id: int) -> None:
         """Safely delete a Vertex Array Object belonging to this context.
@@ -357,6 +348,7 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
     def _get_uniform_func_tables(self):
         _uniform_getters: dict[GLDataType, Callable] = {
             gl.GLint: self.glGetUniformiv,
+            gl.GLuint: self.glGetUniformuiv,
             gl.GLfloat: self.glGetUniformfv,
             gl.GLboolean: self.glGetUniformiv,
         }
@@ -373,6 +365,11 @@ class OpenGLSurfaceContext(SurfaceContext, GLFunctions):
             gl.GL_INT_VEC3: (gl.GLint, self.glUniform3iv, self.glProgramUniform3iv, 3),
             gl.GL_INT_VEC4: (gl.GLint, self.glUniform4iv, self.glProgramUniform4iv, 4),
 
+            gl.GL_UNSIGNED_INT: (gl.GLuint, self.glUniform1uiv, self.glProgramUniform1uiv, 1),
+            gl.GL_UNSIGNED_INT_VEC2: (gl.GLuint, self.glUniform2uiv, self.glProgramUniform2uiv, 2),
+            gl.GL_UNSIGNED_INT_VEC3: (gl.GLuint, self.glUniform3uiv, self.glProgramUniform3uiv, 3),
+            gl.GL_UNSIGNED_INT_VEC4: (gl.GLuint, self.glUniform4uiv, self.glProgramUniform4uiv, 4),
+
             gl.GL_FLOAT: (gl.GLfloat, self.glUniform1fv, self.glProgramUniform1fv, 1),
             gl.GL_FLOAT_VEC2: (gl.GLfloat, self.glUniform2fv, self.glProgramUniform2fv, 2),
             gl.GL_FLOAT_VEC3: (gl.GLfloat, self.glUniform3fv, self.glProgramUniform3fv, 3),