Frogging-Family / wine-tkg-git

The wine-tkg build systems, to create custom Wine and Proton builds
856 stars 155 forks source link

Proton-TKG fails to build due to glsl wined3d errors #1103

Closed gardotd426 closed 8 months ago

gardotd426 commented 9 months ago

Using the most recent staging commit (because master fails due to un-rebased patches), building proton-tkg fails with a ton of glsl wined3d errors.

Here is like the last third of the error output:

../wine-git/dlls/wined3d/glsl_shader.c:12514:5: error: ‘glsl_fragment_pipe_enable’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe’?
12514 |     glsl_fragment_pipe_enable,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe
../wine-git/dlls/wined3d/glsl_shader.c:12515:5: error: ‘glsl_fragment_pipe_get_caps’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe’?
12515 |     glsl_fragment_pipe_get_caps,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe
../wine-git/dlls/wined3d/glsl_shader.c:12516:5: error: ‘glsl_fragment_pipe_get_emul_mask’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe_state_template’?
12516 |     glsl_fragment_pipe_get_emul_mask,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe_state_template
../wine-git/dlls/wined3d/glsl_shader.c:12517:5: error: ‘glsl_fragment_pipe_alloc’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe’?
12517 |     glsl_fragment_pipe_alloc,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe
../wine-git/dlls/wined3d/glsl_shader.c:12518:5: error: ‘glsl_fragment_pipe_free’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe’?
12518 |     glsl_fragment_pipe_free,
      |     ^~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe
../wine-git/dlls/wined3d/glsl_shader.c:12519:5: error: ‘glsl_fragment_pipe_alloc_context_data’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe_state_template’?
12519 |     glsl_fragment_pipe_alloc_context_data,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe_state_template
../wine-git/dlls/wined3d/glsl_shader.c:12520:5: error: ‘glsl_fragment_pipe_free_context_data’ undeclared (first use in this function); did you mean ‘glsl_fragment_pipe_state_template’?
12520 |     glsl_fragment_pipe_free_context_data,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |     glsl_fragment_pipe_state_template
../wine-git/dlls/wined3d/glsl_shader.c:12525:1: warning: empty declaration
12525 | struct glsl_blitter_args
      | ^~~~~~
../wine-git/dlls/wined3d/glsl_shader.c:12532:1: warning: empty declaration
12532 | struct glsl_blitter_program
      | ^~~~~~
../wine-git/dlls/wined3d/glsl_shader.c:12539:1: warning: empty declaration
12539 | struct wined3d_glsl_blitter
      | ^~~~~~
../wine-git/dlls/wined3d/glsl_shader.c:12548:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12548 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12557:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12557 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12570:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12570 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12593:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12593 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12613:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12613 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12712:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12712 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12793:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12793 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12862:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12862 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12920:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12920 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:12933:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
12933 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13063:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13063 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13101:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13101 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13143:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13143 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13224:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13224 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13401:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13401 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13409:41: error: storage class specified for parameter ‘glsl_blitter_ops’
13409 | static const struct wined3d_blitter_ops glsl_blitter_ops =
      |                                         ^~~~~~~~~~~~~~~~
../wine-git/dlls/wined3d/glsl_shader.c:13410:1: error: parameter ‘glsl_blitter_ops’ is initialized
13410 | {
      | ^
../wine-git/dlls/wined3d/glsl_shader.c:13411:5: error: ‘glsl_blitter_destroy’ undeclared (first use in this function); did you mean ‘glsl_blitter_ops’?
13411 |     glsl_blitter_destroy,
      |     ^~~~~~~~~~~~~~~~~~~~
      |     glsl_blitter_ops
../wine-git/dlls/wined3d/glsl_shader.c:13412:5: error: ‘glsl_blitter_clear’ undeclared (first use in this function); did you mean ‘glsl_blitter_ops’?
13412 |     glsl_blitter_clear,
      |     ^~~~~~~~~~~~~~~~~~
      |     glsl_blitter_ops
../wine-git/dlls/wined3d/glsl_shader.c:13413:5: error: ‘glsl_blitter_blit’ undeclared (first use in this function); did you mean ‘glsl_blitter_ops’?
13413 |     glsl_blitter_blit,
      |     ^~~~~~~~~~~~~~~~~
      |     glsl_blitter_ops
../wine-git/dlls/wined3d/glsl_shader.c:13418:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
13418 | {
      | ^
../wine-git/dlls/wined3d/wined3d_private.h:3678:6: error: old-style parameter declarations in prototyped function definition
 3678 | void wined3d_cs_emit_gl_texture_callback(struct wined3d_cs *cs, struct wined3d_texture *texture,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../wine-git/dlls/wined3d/glsl_shader.c:13445: error: expected ‘{’ at end of input
make: *** [Makefile:152194: dlls/wined3d/x86_64-windows/glsl_shader.o] Error 1
 -> Removed BIG_UGLY_FROGMINER - Ribbit
 -> Removed Proton-tkg token - Valve Ribbit
 -> exit cleanup done
Tk-Glitch commented 8 months ago

Fixed by https://github.com/Frogging-Family/wine-tkg-git/commit/00d62f9684a0bf62ec65b582fb1fab9cae80ea97