API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 3rd, 2016
180
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.05 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/gallium/drivers/swr/avx/Makefile.am b/src/gallium/drivers/swr/avx/Makefile.am
  2. index 384f1a7..4b14945 100644
  3. --- a/src/gallium/drivers/swr/avx/Makefile.am
  4. +++ b/src/gallium/drivers/swr/avx/Makefile.am
  5. @@ -31,6 +31,7 @@ AM_CXXFLAGS = \
  6. $(LLVM_CFLAGS) \
  7. -I$(builddir)/rasterizer/scripts \
  8. -I$(builddir)/rasterizer/jitter \
  9. + -I$(srcdir)/../rasterizer/scripts \
  10. -I$(srcdir)/../rasterizer \
  11. -I$(srcdir)/../rasterizer/core \
  12. -I$(srcdir)/../rasterizer/jitter
  13. @@ -38,13 +39,13 @@ AM_CXXFLAGS = \
  14. lib_LTLIBRARIES = libswrAVX.la
  15.  
  16. BUILT_SOURCES = \
  17. - rasterizer/scripts/gen_knobs.cpp \
  18. - rasterizer/scripts/gen_knobs.h \
  19. - rasterizer/jitter/state_llvm.h \
  20. - rasterizer/jitter/builder_gen.h \
  21. - rasterizer/jitter/builder_gen.cpp \
  22. - rasterizer/jitter/builder_x86.h \
  23. - rasterizer/jitter/builder_x86.cpp
  24. + $(srcdir)/../rasterizer/scripts/gen_knobs.cpp \
  25. + $(srcdir)/../rasterizer/scripts/gen_knobs.h \
  26. + $(srcdir)/../rasterizer/jitter/state_llvm.h \
  27. + $(srcdir)/../rasterizer/jitter/builder_gen.h \
  28. + $(srcdir)/../rasterizer/jitter/builder_gen.cpp \
  29. + $(srcdir)/../rasterizer/jitter/builder_x86.h \
  30. + $(srcdir)/../rasterizer/jitter/builder_x86.cpp
  31.  
  32. libswrAVX_la_SOURCES = \
  33. $(CXX_SOURCES) \
  34. @@ -54,41 +55,41 @@ libswrAVX_la_SOURCES = \
  35. $(MEMORY_CXX_SOURCES) \
  36. $(BUILT_SOURCES)
  37.  
  38. -rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
  39. +$(srcdir)/../rasterizer/scripts/gen_knobs.cpp $(srcdir)/../rasterizer/scripts/gen_knobs.h: $(srcdir)/../rasterizer/scripts/gen_knobs.py $(srcdir)/../rasterizer/scripts/knob_defs.py $(srcdir)/../rasterizer/scripts/templates/knobs.template
  40. $(PYTHON2) $(PYTHON_FLAGS) \
  41. $(srcdir)/../rasterizer/scripts/gen_knobs.py \
  42. - rasterizer/scripts
  43. + $(srcdir)/../rasterizer/scripts
  44.  
  45. -rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
  46. +$(srcdir)/../rasterizer/jitter/state_llvm.h: $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_types.py $(srcdir)/../rasterizer/core/state.h
  47. $(PYTHON2) $(PYTHON_FLAGS) \
  48. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_types.py \
  49. --input $(srcdir)/../rasterizer/core/state.h \
  50. - --output rasterizer/jitter/state_llvm.h
  51. + --output $(srcdir)/../rasterizer/jitter/state_llvm.h
  52.  
  53. -rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
  54. +$(srcdir)/../rasterizer/jitter/builder_gen.h: $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
  55. $(PYTHON2) $(PYTHON_FLAGS) \
  56. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  57. --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
  58. - --output rasterizer/jitter/builder_gen.h \
  59. + --output $(srcdir)/../rasterizer/jitter/builder_gen.h \
  60. --gen_h
  61.  
  62. -rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
  63. +$(srcdir)/../rasterizer/jitter/builder_gen.cpp: $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
  64. $(PYTHON2) $(PYTHON_FLAGS) \
  65. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  66. --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
  67. - --output rasterizer/jitter/builder_gen.cpp \
  68. + --output $(srcdir)/../rasterizer/jitter/builder_gen.cpp \
  69. --gen_cpp
  70.  
  71. -rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  72. +$(srcdir)/../rasterizer/jitter/builder_x86.h: $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  73. $(PYTHON2) $(PYTHON_FLAGS) \
  74. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  75. - --output rasterizer/jitter/builder_x86.h \
  76. + --output $(srcdir)/../rasterizer/jitter/builder_x86.h \
  77. --gen_x86_h
  78.  
  79. -rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  80. +$(srcdir)/../rasterizer/jitter/builder_x86.cpp: $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  81. $(PYTHON2) $(PYTHON_FLAGS) \
  82. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  83. - --output rasterizer/jitter/builder_x86.cpp \
  84. + --output $(srcdir)/../rasterizer/jitter/builder_x86.cpp \
  85. --gen_x86_cpp
  86.  
  87.  
  88. diff --git a/src/gallium/drivers/swr/avx2/Makefile.am b/src/gallium/drivers/swr/avx2/Makefile.am
  89. index a3968ec..1ed9d2a 100644
  90. --- a/src/gallium/drivers/swr/avx2/Makefile.am
  91. +++ b/src/gallium/drivers/swr/avx2/Makefile.am
  92. @@ -38,13 +38,13 @@ AM_CXXFLAGS = \
  93. lib_LTLIBRARIES = libswrAVX2.la
  94.  
  95. BUILT_SOURCES = \
  96. - rasterizer/scripts/gen_knobs.cpp \
  97. - rasterizer/scripts/gen_knobs.h \
  98. - rasterizer/jitter/state_llvm.h \
  99. - rasterizer/jitter/builder_gen.h \
  100. - rasterizer/jitter/builder_gen.cpp \
  101. - rasterizer/jitter/builder_x86.h \
  102. - rasterizer/jitter/builder_x86.cpp
  103. + $(srcdir)/../rasterizer/scripts/gen_knobs.cpp \
  104. + $(srcdir)/../rasterizer/scripts/gen_knobs.h \
  105. + $(srcdir)/../rasterizer/jitter/state_llvm.h \
  106. + $(srcdir)/../rasterizer/jitter/builder_gen.h \
  107. + $(srcdir)/../rasterizer/jitter/builder_gen.cpp \
  108. + $(srcdir)/../rasterizer/jitter/builder_x86.h \
  109. + $(srcdir)/../rasterizer/jitter/builder_x86.cpp
  110.  
  111. libswrAVX2_la_SOURCES = \
  112. $(CXX_SOURCES) \
  113. @@ -57,7 +57,7 @@ libswrAVX2_la_SOURCES = \
  114. rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
  115. $(PYTHON2) $(PYTHON_FLAGS) \
  116. $(srcdir)/../rasterizer/scripts/gen_knobs.py \
  117. - rasterizer/scripts
  118. + $(srcdir)/../rasterizer/scripts
  119.  
  120. rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
  121. $(PYTHON2) $(PYTHON_FLAGS) \
  122. @@ -69,26 +69,26 @@ rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  123. $(PYTHON2) $(PYTHON_FLAGS) \
  124. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  125. --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
  126. - --output rasterizer/jitter/builder_gen.h \
  127. + --output $(srcdir)/../rasterizer/jitter/builder_gen.h \
  128. --gen_h
  129.  
  130. rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
  131. $(PYTHON2) $(PYTHON_FLAGS) \
  132. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  133. --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
  134. - --output rasterizer/jitter/builder_gen.cpp \
  135. + --output $(srcdir)/../rasterizer/jitter/builder_gen.cpp \
  136. --gen_cpp
  137.  
  138. rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  139. $(PYTHON2) $(PYTHON_FLAGS) \
  140. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  141. - --output rasterizer/jitter/builder_x86.h \
  142. + --output $(srcdir)/../rasterizer/jitter/builder_x86.h \
  143. --gen_x86_h
  144.  
  145. rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
  146. $(PYTHON2) $(PYTHON_FLAGS) \
  147. $(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
  148. - --output rasterizer/jitter/builder_x86.cpp \
  149. + --output $(srcdir)/../rasterizer/jitter/builder_x86.cpp \
  150. --gen_x86_cpp
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!