spacepaste

Paste details

reply | raw

  1.  
  2. diff -u -u -r src/compiler/glsl/ast.h ../vcxsrv-code/mesalib/src/compiler/glsl/ast.h
  3. --- src/compiler/glsl/ast.h 2017-11-30 14:02:04.217975473 +0000
  4. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/ast.h 2017-08-02 23:50:09.530125510 +0100
  5. @@ -49,6 +49,10 @@
  6. class ast_node {
  7. public:
  8. DECLARE_LINEAR_ZALLOC_CXX_OPERATORS(ast_node);
  9. + static void operator delete(void *table, void *ctx)
  10. + {
  11. + ralloc_free(table);
  12. + }
  14. /**
  15. * Print an AST node in something approximating the original GLSL code
  16. diff -u -u -r src/compiler/glsl/builtin_functions.cpp ../vcxsrv-code/mesalib/src/compiler/glsl/builtin_functions.cpp
  17. --- src/compiler/glsl/builtin_functions.cpp 2017-11-30 14:02:04.217975473 +0000
  18. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/builtin_functions.cpp 2017-09-23 17:11:47.075775800 +0100
  19. @@ -85,8 +85,8 @@
  20. #include "util/hash_table.h"
  22. #define M_PIf ((float) M_PI)
  23. -#define M_PI_2f ((float) M_PI_2)
  24. -#define M_PI_4f ((float) M_PI_4)
  25. +#define M_PI_2f ((float) M_PI/2.0f)
  26. +#define M_PI_4f ((float) M_PI/4.0f)
  28. using namespace ir_builder;
  30. Only in ../vcxsrv-code/mesalib/src/compiler/glsl: doflexbison.bat
  31. Only in ../vcxsrv-code/mesalib/src/compiler/glsl: getopt.cpp
  32. diff -u -u -r src/compiler/glsl/.gitignore ../vcxsrv-code/mesalib/src/compiler/glsl/.gitignore
  33. --- src/compiler/glsl/.gitignore 2017-08-03 21:34:27.250372226 +0100
  34. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/.gitignore 2017-09-23 17:11:47.075775800 +0100
  35. @@ -3,6 +3,7 @@
  36. glsl_parser.h
  37. glsl_parser.output
  38. glsl_test
  39. +expression_operation_strings.h
  40. ir_expression_operation.h
  41. ir_expression_operation_strings.h
  42. ir_expression_operation_constant.h
  43. diff -u -u -r src/compiler/glsl/glcpp/glcpp.c ../vcxsrv-code/mesalib/src/compiler/glsl/glcpp/glcpp.c
  44. --- src/compiler/glsl/glcpp/glcpp.c 2017-08-03 21:34:27.260372226 +0100
  45. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/glcpp/glcpp.c 2017-08-02 23:50:09.530125510 +0100
  46. @@ -31,6 +31,14 @@
  47. #include "main/shaderobj.h"
  48. #include "util/strtod.h"
  50. +#ifdef _MSC_VER
  51. +#include <io.h>
  52. +#define STDIN_FILENO 0
  53. +#define read _read
  54. +#define open _open
  55. +#define close _close
  56. +#endif
  57. +
  58. extern int glcpp_parser_debug;
  60. void
  61. Only in src/compiler/glsl/glcpp: tests
  62. diff -u -u -r src/compiler/glsl/glsl_parser_extras.h ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_parser_extras.h
  63. --- src/compiler/glsl/glsl_parser_extras.h 2017-11-30 14:02:04.227975473 +0000
  64. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_parser_extras.h 2017-09-23 17:11:47.075775800 +0100
  65. @@ -76,6 +76,10 @@
  66. void *mem_ctx);
  68. DECLARE_RZALLOC_CXX_OPERATORS(_mesa_glsl_parse_state);
  69. + static void operator delete(void *mem, void *ctx)
  70. + {
  71. + ralloc_free(mem);
  72. + }
  74. /**
  75. * Generate a string representing the GLSL version currently being compiled
  76. diff -u -u -r src/compiler/glsl/glsl_parser.yy ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_parser.yy
  77. --- src/compiler/glsl/glsl_parser.yy 2017-11-30 14:02:04.227975473 +0000
  78. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_parser.yy 2017-08-02 23:50:09.530125510 +0100
  79. @@ -23,6 +23,7 @@
  80. */
  81. #include <stdio.h>
  82. #include <stdlib.h>
  83. +#include <unistd.h>
  84. #include <string.h>
  85. #ifndef _MSC_VER
  86. #include <strings.h>
  87. diff -u -u -r src/compiler/glsl/glsl_symbol_table.cpp ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_symbol_table.cpp
  88. --- src/compiler/glsl/glsl_symbol_table.cpp 2017-08-03 21:34:27.260372226 +0100
  89. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_symbol_table.cpp 2017-08-02 23:50:09.530125510 +0100
  90. @@ -28,6 +28,10 @@
  91. class symbol_table_entry {
  92. public:
  93. DECLARE_LINEAR_ALLOC_CXX_OPERATORS(symbol_table_entry);
  94. + static void operator delete(void *entry, void *ctx)
  95. + {
  96. + ralloc_free(entry);
  97. + }
  99. bool add_interface(const glsl_type *i, enum ir_variable_mode mode)
  100. {
  101. diff -u -u -r src/compiler/glsl/glsl_symbol_table.h ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_symbol_table.h
  102. --- src/compiler/glsl/glsl_symbol_table.h 2017-08-03 21:34:27.260372226 +0100
  103. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/glsl_symbol_table.h 2017-08-02 23:50:09.530125510 +0100
  104. @@ -41,6 +41,11 @@
  105. */
  106. struct glsl_symbol_table {
  107. DECLARE_RALLOC_CXX_OPERATORS(glsl_symbol_table)
  108. + static void operator delete(void *table, void *ctx)
  109. + {
  110. + ralloc_set_destructor(table, NULL);
  111. + ralloc_free(table);
  112. + }
  114. glsl_symbol_table();
  115. ~glsl_symbol_table();
  116. diff -u -u -r src/compiler/glsl/list.h ../vcxsrv-code/mesalib/src/compiler/glsl/list.h
  117. --- src/compiler/glsl/list.h 2017-08-03 21:34:27.270372226 +0100
  118. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/list.h 2017-08-02 23:50:09.540125510 +0100
  119. @@ -56,6 +56,10 @@
  121. #ifdef __cplusplus
  122. DECLARE_RZALLOC_CXX_OPERATORS(exec_node)
  123. + static void operator delete(void *node, void *ctx)
  124. + {
  125. + ralloc_free(node);
  126. + }
  128. exec_node() : next(NULL), prev(NULL)
  129. {
  130. @@ -287,6 +291,10 @@
  132. #ifdef __cplusplus
  133. DECLARE_RALLOC_CXX_OPERATORS(exec_list)
  134. + static void operator delete(void *node, void *ctx)
  135. + {
  136. + ralloc_free(node);
  137. + }
  139. exec_list()
  140. {
  141. diff -u -u -r src/compiler/glsl/main.cpp ../vcxsrv-code/mesalib/src/compiler/glsl/main.cpp
  142. --- src/compiler/glsl/main.cpp 2017-10-04 19:05:09.592090285 +0100
  143. +++ ../vcxsrv-code/mesalib/src/compiler/glsl/main.cpp 2017-09-23 17:11:47.085775800 +0100
  144. @@ -22,7 +22,16 @@
  145. */
  147. #include <stdio.h>
  148. +#ifdef _MSC_VER
  149. +#define __STDC__ 1
  150. #include <getopt.h>
  151. +#define open _open
  152. +#define read _read
  153. +#define fstat _fstat
  154. +#define stat _stat
  155. +#define close _close
  156. +#define O_RDONLY _O_RDONLY
  157. +#endif
  159. /** @file main.cpp
  160. *
  161. Only in src/compiler/glsl: tests
  162.  
Powered by spacepaste. Paste removal.