Skip to content
Snippets Groups Projects

tests: Introduce an OpenGL shader runner.

Merged Henri Verbeet requested to merge hverbeet/vkd3d:for_upstream_2 into master
2 unresolved threads

Merge request reports

Merge request pipeline #18765 skipped

Merge request pipeline skipped for beb3f6e0

Approved by

Merged by Alexandre JulliardAlexandre Julliard 1 year ago (Nov 22, 2023 9:49pm UTC)

Merge details

  • Changes merged into master with beb3f6e0.
  • Deleted the source branch.

Pipeline #18766 passed

Pipeline passed for beb3f6e0 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
67
68 struct vkd3d_shader_combined_resource_sampler *combined_samplers;
69 unsigned int combined_sampler_count;
70 };
71
72 static struct gl_runner *gl_runner(struct shader_runner *r)
73 {
74 return CONTAINING_RECORD(r, struct gl_runner, r);
75 }
76
77 static void debug_output(GLenum source, GLenum type, GLuint id, GLenum severity,
78 GLsizei length, const GLchar *message, const void *userParam)
79 {
80 if (message[length - 1] == '\n')
81 --length;
82 trace("%.*s\n", length, message);
  • This is a bit annoyingly chatty, at least on my setup. It prints a lot of messages like:

    shader_runner_gl:82: Section [test], line 40: Shader Stats: SGPRS: 32 VGPRS: 16 Code Size: 200 LDS: 0 Scratch: 0 Max Waves: 20 Spilled SGPRs: 0 Spilled VGPRs: 0 PrivMem VGPRs: 0 Outputs: 0 PatchOutputs: 0 DivergentLoop: 0 InlineUniforms: 0 (VS, W32)
    shader_runner_gl:82: Section [test], line 40: Shader Stats: SGPRS: 8 VGPRS: 8 Code Size: 60 LDS: 0 Scratch: 0 Max Waves: 20 Spilled SGPRs: 0 Spilled VGPRs: 0 PrivMem VGPRs: 0 Outputs: 1 PatchOutputs: 0 DivergentLoop: 0 InlineUniforms: 0 (PS, W32)

    That's s bit more than what I consider sensible for a default verbosity level. Could that be reduced?

  • Please register or sign in to reply
    • Author Maintainer

      That's s bit more than what I consider sensible for a default verbosity level. Could that be reduced?

      Sure, glDebugMessageControl() can be used to tweak what gets reported. I guess those are GL_DEBUG_SEVERITY_NOTIFICATION messages, but you can check what debug_output() receives for "type" and "severity" to see what to disable.

    • They are GL_DEBUG_TYPE_OTHER and GL_DEBUG_SEVERITY_NOTIFICATION, as you had guessed.

    • Please register or sign in to reply
  • Henri Verbeet added 1 commit

    added 1 commit

    • 9d2264ac - tests: Introduce an OpenGL shader runner.

    Compare with previous version

  • Author Maintainer

    They are GL_DEBUG_TYPE_OTHER and GL_DEBUG_SEVERITY_NOTIFICATION, as you had guessed.

    I've pushed a version that disables GL_DEBUG_SEVERITY_NOTIFICATION messages and installs the required packages for the CI; how's that?

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Alexandre Julliard added 23 commits

    added 23 commits

    Compare with previous version

  • Giovanni Mascellani mentioned in merge request !1168 (closed)

    mentioned in merge request !1168 (closed)

  • Please register or sign in to reply
    Loading