Move Windows GL info mapping to renderer gl
This commit is contained in:
@@ -196,6 +196,9 @@ Known local toolchain state:
|
|||||||
longer expose raw OpenGL enum defaults; default texture formats, sampler
|
longer expose raw OpenGL enum defaults; default texture formats, sampler
|
||||||
filters/wraps, and render-target formats resolve through backend-owned
|
filters/wraps, and render-target formats resolve through backend-owned
|
||||||
overloads.
|
overloads.
|
||||||
|
The Windows entrypoint also consumes backend-owned generic OpenGL error-code
|
||||||
|
and info-string tokens; WGL context/pixel-format constants remain in the
|
||||||
|
platform shell for a later platform-boundary slice.
|
||||||
- `windows-msvc-vcpkg-headless` validates manifest install/configure/build/test
|
- `windows-msvc-vcpkg-headless` validates manifest install/configure/build/test
|
||||||
for the current headless component matrix; see DEBT-0007 for remaining app
|
for the current headless component matrix; see DEBT-0007 for remaining app
|
||||||
and platform triplet migration.
|
and platform triplet migration.
|
||||||
|
|||||||
@@ -463,6 +463,9 @@ Legacy `Texture2D`, `TextureManager`, `Sampler`, and `RTT` public headers no
|
|||||||
longer expose raw OpenGL enum defaults; default texture formats, sampler
|
longer expose raw OpenGL enum defaults; default texture formats, sampler
|
||||||
filters/wraps, and render-target formats are resolved through backend-owned
|
filters/wraps, and render-target formats are resolved through backend-owned
|
||||||
overloads.
|
overloads.
|
||||||
|
The Windows entrypoint now delegates generic OpenGL error-code and info-string
|
||||||
|
tokens to `pp_renderer_gl`; WGL context/pixel-format constants remain in the
|
||||||
|
platform shell for a later platform-boundary slice.
|
||||||
The existing renderer classes are not yet fully
|
The existing renderer classes are not yet fully
|
||||||
behind the renderer interfaces.
|
behind the renderer interfaces.
|
||||||
|
|
||||||
|
|||||||
11
src/main.cpp
11
src/main.cpp
@@ -8,6 +8,7 @@
|
|||||||
#include "canvas.h"
|
#include "canvas.h"
|
||||||
#include "keymap.h"
|
#include "keymap.h"
|
||||||
#include "hmd.h"
|
#include "hmd.h"
|
||||||
|
#include "renderer_gl/opengl_capabilities.h"
|
||||||
#include "../resource.h"
|
#include "../resource.h"
|
||||||
|
|
||||||
#include <shellscalingapi.h>
|
#include <shellscalingapi.h>
|
||||||
@@ -828,7 +829,7 @@ void _post_call_callback(const char* name, void* funcptr, int len_args, ...)
|
|||||||
GLenum error_code;
|
GLenum error_code;
|
||||||
error_code = glad_glGetError();
|
error_code = glad_glGetError();
|
||||||
|
|
||||||
if (error_code != GL_NO_ERROR)
|
if (error_code != pp::renderer::gl::no_error_code())
|
||||||
{
|
{
|
||||||
LOG("ERROR %d in %s\n", error_code, name);
|
LOG("ERROR %d in %s\n", error_code, name);
|
||||||
}
|
}
|
||||||
@@ -958,9 +959,9 @@ int main(int argc, char** argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG("GL version: %s", glGetString(GL_VERSION));
|
LOG("GL version: %s", glGetString(static_cast<GLenum>(pp::renderer::gl::version_string_name())));
|
||||||
LOG("GL vendor: %s", glGetString(GL_VENDOR));
|
LOG("GL vendor: %s", glGetString(static_cast<GLenum>(pp::renderer::gl::vendor_string_name())));
|
||||||
LOG("GL renderer: %s", glGetString(GL_RENDERER));
|
LOG("GL renderer: %s", glGetString(static_cast<GLenum>(pp::renderer::gl::renderer_string_name())));
|
||||||
|
|
||||||
#ifdef USE_RENDERDOC
|
#ifdef USE_RENDERDOC
|
||||||
if (!win32_renderdoc_init())
|
if (!win32_renderdoc_init())
|
||||||
@@ -968,7 +969,7 @@ int main(int argc, char** argv)
|
|||||||
#endif // USE_RENDERDOC
|
#endif // USE_RENDERDOC
|
||||||
|
|
||||||
swprintf_s(window_title, L"PanoPainter %s (%s)", g_version_number_w,
|
swprintf_s(window_title, L"PanoPainter %s (%s)", g_version_number_w,
|
||||||
str2wstr((char*)glGetString(GL_RENDERER)).c_str());
|
str2wstr((char*)glGetString(static_cast<GLenum>(pp::renderer::gl::renderer_string_name()))).c_str());
|
||||||
|
|
||||||
// If supported create a 3.3 context
|
// If supported create a 3.3 context
|
||||||
if (GLAD_WGL_ARB_create_context)
|
if (GLAD_WGL_ARB_create_context)
|
||||||
|
|||||||
Reference in New Issue
Block a user