summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 71cb3ff)
raw | patch | inline | side by side (from parent 1: 71cb3ff)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Thu, 23 Feb 2023 00:20:42 +0000 (03:20 +0300) | ||
committer | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Fri, 9 Jun 2023 09:20:52 +0000 (12:20 +0300) |
src/game/renders/opengl/r_textures.pas | patch | blob | history | |
src/nogl/noGL.pas | patch | blob | history | |
src/nogl/noGLES1.inc | patch | blob | history |
index 2ddf6873ee963d64e8b085c7d1a941a897041b61..11dfdaeea189b39a6bc68ad41703e91254c270c6 100644 (file)
GL_STACK_OVERFLOW: s := 'GL_STACK_OVERFLOW';
GL_STACK_UNDERFLOW: s := 'GL_STACK_UNDERFLOW';
GL_OUT_OF_MEMORY: s := 'GL_OUT_OF_MEMORY';
- GL_TABLE_TOO_LARGE: s := 'GL_TABLE_TOO_LARGE';
+ {$IFNDEF USE_GLES1}
+ GL_TABLE_TOO_LARGE: s := 'GL_TABLE_TOO_LARGE';
+ {$ENDIF}
otherwise s := '';
end;
- if s = '' then
+ if s <> '' then
e_LogWritefln('%s: %s', [msg, s])
else
e_LogWritefln('%s: error code %s', [msg, code]);
diff --git a/src/nogl/noGL.pas b/src/nogl/noGL.pas
index 5ee98a274668784093d042ab1d10ce2fccd01efa..0c6724912e117d7ae4f7c836882636e9708fd15d 100644 (file)
--- a/src/nogl/noGL.pas
+++ b/src/nogl/noGL.pas
const
GL_NO_ERROR = 0;
+ GL_INVALID_ENUM = $0500;
+ GL_INVALID_VALUE = $0501;
+ GL_INVALID_OPERATION = $0502;
+ GL_STACK_OVERFLOW = $0503;
+ GL_STACK_UNDERFLOW = $0504;
+ GL_OUT_OF_MEMORY = $0505;
GL_NEAREST = $2600;
GL_DEPTH_TEST = $0B71;
GL_SCISSOR_TEST = $0C11;
diff --git a/src/nogl/noGLES1.inc b/src/nogl/noGLES1.inc
index 6142e2e4ee6c148f254d365c166ed62be90f986e..6318e9b6356a081aa8f8c21ff0a6da26375de15f 100644 (file)
--- a/src/nogl/noGLES1.inc
+++ b/src/nogl/noGLES1.inc
GL_TEXTURE_COORD_ARRAY = $8078;
GL_TRIANGLES = $0004;
GL_TEXTURE0 = $84C0;
- GL_INVALID_ENUM = $0500;
const
ValPerVertex = 2;