revert arcade.gl changes to reduce merge issues for gl abstraction PR

Author: eruvanos

arcade/gl/buffer.py

@@ -100,7 +100,7 @@ def size(self) -> int:
         return self._size
 
     @property
-    def ctx(self) -> Context:
+    def ctx(self) -> "Context":
         """The context this resource belongs to."""
         return self._ctx
 
@@ -163,9 +163,11 @@ def read(self, size: int = -1, offset: int = 0) -> bytes:
         # Manually detect this so it doesn't raise a confusing INVALID_VALUE error
         if size + offset > self._size:
             raise ValueError(
-                "Attempting to read outside the buffer. "
-                f"Buffer size: {self._size} "
-                f"Reading from {offset} to {size + offset}"
+                (
+                    "Attempting to read outside the buffer. "
+                    f"Buffer size: {self._size} "
+                    f"Reading from {offset} to {size + offset}"
+                )
             )
 
         gl.glBindBuffer(gl.GL_ARRAY_BUFFER, self._glo)

arcade/gl/compute_shader.py

@@ -86,7 +86,7 @@ def __init__(self, ctx: Context, glsl_source: str) -> None:
             gl.glGetProgramiv(self._glo, gl.GL_INFO_LOG_LENGTH, length)
             log = c_buffer(length.value)
             gl.glGetProgramInfoLog(self._glo, len(log), None, log)
-            raise ShaderException(f"Program link error: {log.value.decode()}")
+            raise ShaderException("Program link error: {}".format(log.value.decode()))
 
         self._introspect_uniforms()
         self._introspect_uniform_blocks()

arcade/gl/context.py

@@ -3,12 +3,18 @@
 import logging
 import weakref
 from collections import deque
-from collections.abc import Iterable, Sequence
 from contextlib import contextmanager
 from ctypes import c_char_p, c_float, c_int, cast
 from typing import (
     Any,
+    Deque,
+    Dict,
+    Iterable,
+    List,
     Literal,
+    Sequence,
+    Set,
+    Tuple,
     overload,
 )
 
@@ -267,9 +273,9 @@ def __init__(
         gl.glEnable(gl.GL_SCISSOR_TEST)
 
         # States
-        self._blend_func: tuple[int, int] | tuple[int, int, int, int] = self.BLEND_DEFAULT
+        self._blend_func: Tuple[int, int] | Tuple[int, int, int, int] = self.BLEND_DEFAULT
         self._point_size = 1.0
-        self._flags: set[int] = set()
+        self._flags: Set[int] = set()
         self._wireframe = False
         # Options for cull_face
         self._cull_face_options = {
@@ -288,7 +294,7 @@ def __init__(
         self.gc_mode = gc_mode
         #: Collected objects to gc when gc_mode is "context_gc".
         #: This can be used during debugging.
-        self.objects: deque[Any] = deque()
+        self.objects: Deque[Any] = deque()
 
     @property
     def info(self) -> GLInfo:
@@ -365,7 +371,7 @@ def fbo(self) -> Framebuffer:
         return self.active_framebuffer
 
     @property
-    def gl_version(self) -> tuple[int, int]:
+    def gl_version(self) -> Tuple[int, int]:
         """
         The OpenGL major and minor version as a tuple.
 
@@ -578,7 +584,7 @@ def is_enabled(self, flag) -> bool:
         return flag in self._flags
 
     @property
-    def viewport(self) -> tuple[int, int, int, int]:
+    def viewport(self) -> Tuple[int, int, int, int]:
         """
         Get or set the viewport for the currently active framebuffer.
         The viewport simply describes what pixels of the screen
@@ -595,11 +601,11 @@ def viewport(self) -> tuple[int, int, int, int]:
         return self.active_framebuffer.viewport
 
     @viewport.setter
-    def viewport(self, value: tuple[int, int, int, int]):
+    def viewport(self, value: Tuple[int, int, int, int]):
         self.active_framebuffer.viewport = value
 
     @property
-    def scissor(self) -> tuple[int, int, int, int] | None:
+    def scissor(self) -> Tuple[int, int, int, int] | None:
         """
         Get or set the scissor box for the active framebuffer.
         This is a shortcut for :py:meth:`~arcade.gl.Framebuffer.scissor`.
@@ -624,7 +630,7 @@ def scissor(self, value):
         self.fbo.scissor = value
 
     @property
-    def blend_func(self) -> tuple[int, int] | tuple[int, int, int, int]:
+    def blend_func(self) -> Tuple[int, int] | Tuple[int, int, int, int]:
         """
         Get or set the blend function.
         This is tuple specifying how the color and
@@ -672,7 +678,7 @@ def blend_func(self) -> tuple[int, int] | tuple[int, int, int, int]:
         return self._blend_func
 
     @blend_func.setter
-    def blend_func(self, value: tuple[int, int] | tuple[int, int, int, int]):
+    def blend_func(self, value: Tuple[int, int] | Tuple[int, int, int, int]):
         self._blend_func = value
         if len(value) == 2:
             gl.glBlendFunc(*value)
@@ -946,7 +952,7 @@ def buffer(
     def framebuffer(
         self,
         *,
-        color_attachments: Texture2D | list[Texture2D] | None = None,
+        color_attachments: Texture2D | List[Texture2D] | None = None,
         depth_attachment: Texture2D | None = None,
     ) -> Framebuffer:
         """Create a Framebuffer.
@@ -963,14 +969,14 @@ def framebuffer(
 
     def texture(
         self,
-        size: tuple[int, int],
+        size: Tuple[int, int],
         *,
         components: int = 4,
         dtype: str = "f1",
         data: BufferProtocol | None = None,
         wrap_x: PyGLenum | None = None,
         wrap_y: PyGLenum | None = None,
-        filter: tuple[PyGLenum, PyGLenum] | None = None,
+        filter: Tuple[PyGLenum, PyGLenum] | None = None,
         samples: int = 0,
         immutable: bool = False,
         internal_format: PyGLenum | None = None,
@@ -1066,14 +1072,14 @@ def texture(
 
     def texture_array(
         self,
-        size: tuple[int, int, int],
+        size: Tuple[int, int, int],
         *,
         components: int = 4,
         dtype: str = "f1",
         data: BufferProtocol | None = None,
         wrap_x: PyGLenum | None = None,
         wrap_y: PyGLenum | None = None,
-        filter: tuple[PyGLenum, PyGLenum] | None = None,
+        filter: Tuple[PyGLenum, PyGLenum] | None = None,
     ) -> TextureArray:
         """
         Create a 2D Texture Array.
@@ -1099,7 +1105,7 @@ def texture_array(
         )
 
     def depth_texture(
-        self, size: tuple[int, int], *, data: BufferProtocol | None = None
+        self, size: Tuple[int, int], *, data: BufferProtocol | None = None
     ) -> Texture2D:
         """
         Create a 2D depth texture. Can be used as a depth attachment
@@ -1223,8 +1229,8 @@ def program(
         geometry_shader: str | None = None,
         tess_control_shader: str | None = None,
         tess_evaluation_shader: str | None = None,
-        common: list[str] | None = None,
-        defines: dict[str, str] | None = None,
+        common: List[str] | None = None,
+        defines: Dict[str, str] | None = None,
         varyings: Sequence[str] | None = None,
         varyings_capture_mode: str = "interleaved",
     ) -> Program:
@@ -1284,7 +1290,7 @@ def program(
 
         # If we don't have a fragment shader we are doing transform feedback.
         # When a geometry shader is present the out attributes will be located there
-        out_attributes = list(varyings) if varyings is not None else []
+        out_attributes = list(varyings) if varyings is not None else []  # type: List[str]
         if not source_fs and not out_attributes:
             if source_geo:
                 out_attributes = source_geo.out_attributes
@@ -1583,7 +1589,7 @@ def __init__(self, ctx):
         self.MAX_TEXTURE_MAX_ANISOTROPY = self.get_float(gl.GL_MAX_TEXTURE_MAX_ANISOTROPY, 1.0)
         """The highest supported anisotropy value. Usually 8.0 or 16.0."""
 
-        self.MAX_VIEWPORT_DIMS: tuple[int, int] = self.get_int_tuple(gl.GL_MAX_VIEWPORT_DIMS, 2)
+        self.MAX_VIEWPORT_DIMS: Tuple[int, int] = self.get_int_tuple(gl.GL_MAX_VIEWPORT_DIMS, 2)
         """
         The maximum support window or framebuffer viewport.
         This is usually the same as the maximum texture size
@@ -1607,10 +1613,10 @@ def __init__(self, ctx):
             warn("Error happened while querying of limits. Moving on ..")
 
     @overload
-    def get_int_tuple(self, enum: GLenumLike, length: Literal[2]) -> tuple[int, int]: ...
+    def get_int_tuple(self, enum: GLenumLike, length: Literal[2]) -> Tuple[int, int]: ...
 
     @overload
-    def get_int_tuple(self, enum: GLenumLike, length: int) -> tuple[int, ...]: ...
+    def get_int_tuple(self, enum: GLenumLike, length: int) -> Tuple[int, ...]: ...
 
     def get_int_tuple(self, enum: GLenumLike, length: int):
         """

arcade/gl/framebuffer.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 import weakref
-from collections.abc import Generator
 from contextlib import contextmanager
 from ctypes import Array, c_int, c_uint, string_at
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Generator
 
 from pyglet import gl
 
@@ -68,7 +67,7 @@ class Framebuffer:
 
     def __init__(
         self,
-        ctx: Context,
+        ctx: "Context",
         *,
         color_attachments: Texture2D | list[Texture2D],
         depth_attachment: Texture2D | None = None,
@@ -213,7 +212,7 @@ def _set_scissor(self, value):
     scissor = property(_get_scissor, _set_scissor)
 
     @property
-    def ctx(self) -> Context:
+    def ctx(self) -> "Context":
         """The context this object belongs to."""
         return self._ctx
 
@@ -519,7 +518,7 @@ def _check_completeness() -> None:
             )
 
     def __repr__(self):
-        return f"<Framebuffer glo={self._glo.value}>"
+        return "<Framebuffer glo={}>".format(self._glo.value)
 
 
 class DefaultFrameBuffer(Framebuffer):
@@ -542,7 +541,7 @@ class DefaultFrameBuffer(Framebuffer):
 
     __slots__ = ()
 
-    def __init__(self, ctx: Context):
+    def __init__(self, ctx: "Context"):
         self._ctx = ctx
         # TODO: Can we query this?
         self._samples = 0

arcade/gl/glsl.py

@@ -1,6 +1,5 @@
 import re
-from collections.abc import Iterable
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterable
 
 from pyglet import gl
 
@@ -125,10 +124,12 @@ def _find_glsl_version(self) -> int:
         source = "\n".join(f"{str(i + 1).zfill(3)}: {line} " for i, line in enumerate(self._lines))
 
         raise ShaderException(
-            "Cannot find #version in shader source. "
-            "Please provide at least a #version 330 statement in the beginning of the shader.\n"
-            f"---- [{SHADER_TYPE_NAMES[self._type]}] ---\n"
-            f"{source}"
+            (
+                "Cannot find #version in shader source. "
+                "Please provide at least a #version 330 statement in the beginning of the shader.\n"
+                f"---- [{SHADER_TYPE_NAMES[self._type]}] ---\n"
+                f"{source}"
+            )
         )
 
     @staticmethod
@@ -150,7 +151,7 @@ def apply_defines(lines: list[str], defines: dict[str, str]) -> list[str]:
                     if value is None:
                         continue
 
-                    lines[nr] = f"#define {name} {str(value)}"
+                    lines[nr] = "#define {} {}".format(name, str(value))
                 except IndexError:
                     pass
 

arcade/gl/program.py

@@ -1,6 +1,5 @@
 import typing
 import weakref
-from collections.abc import Iterable
 from ctypes import (
     POINTER,
     byref,
@@ -12,7 +11,7 @@
     create_string_buffer,
     pointer,
 )
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Iterable
 
 from pyglet import gl
 
@@ -546,7 +545,7 @@ def link(glo):
             gl.glGetProgramiv(glo, gl.GL_INFO_LOG_LENGTH, length)
             log = c_buffer(length.value)
             gl.glGetProgramInfoLog(glo, len(log), None, log)
-            raise ShaderException(f"Program link error: {log.value.decode()}")
+            raise ShaderException("Program link error: {}".format(log.value.decode()))
 
     def __repr__(self):
-        return f"<Program id={self._glo}>"
+        return "<Program id={}>".format(self._glo)

arcade/gl/sampler.py

@@ -22,7 +22,7 @@ class Sampler:
 
     def __init__(
         self,
-        ctx: Context,
+        ctx: "Context",
         texture: Texture2D,
         *,
         filter: tuple[PyGLuint, PyGLuint] | None = None,

arcade/gl/texture.py

@@ -303,10 +303,12 @@ def _texture_2d(self, data):
                         )
             except gl.GLException as ex:
                 raise gl.GLException(
-                    f"Unable to create texture: {ex} : dtype={self._dtype} "
-                    f"size={self.size} components={self._components} "
-                    f"MAX_TEXTURE_SIZE = {self.ctx.info.MAX_TEXTURE_SIZE}"
-                    f": {ex}"
+                    (
+                        f"Unable to create texture: {ex} : dtype={self._dtype} "
+                        f"size={self.size} components={self._components} "
+                        f"MAX_TEXTURE_SIZE = {self.ctx.info.MAX_TEXTURE_SIZE}"
+                        f": {ex}"
+                    )
                 )
 
     @property
@@ -754,7 +756,7 @@ def delete(self):
         self._glo.value = 0
 
     @staticmethod
-    def delete_glo(ctx: Context, glo: gl.GLuint):
+    def delete_glo(ctx: "Context", glo: gl.GLuint):
         """
         Destroy the texture.
 
@@ -854,8 +856,6 @@ def get_handle(self, resident: bool = True) -> int:
         return handle
 
     def __repr__(self) -> str:
-        return (
-            f"<Texture glo={self._glo.value} "
-            f"size={self._width}x{self._height} "
-            f"components={self._components}>"
+        return "<Texture glo={} size={}x{} components={}>".format(
+            self._glo.value, self._width, self._height, self._components
         )