Startsida Utforska Hjälp
Logga in
PUBLIC_REPOS
/
buildroot
spegling av git://git.buildroot.net/buildroot
2
1
Fork 0
Filer
Träd: be7ee2a088
Grenar Taggar
buildroot
/
package
/
mesa3d
/
0005-src-gallium-drivers-nouveau-codegen-nv50_ir_ra.cpp-p.patch

0005-src-gallium-drivers-nouveau-codegen-nv50_ir_ra.cpp-p.patch 2.3 KB
Historik Rå

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 
  1. From f2ce27b761eeca301a109856f20ed9a8eb06796d Mon Sep 17 00:00:00 2001
    2. 

  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    3. 

  3. Date: Sat, 28 Dec 2019 21:49:43 +0100
    4. 

  4. Subject: [PATCH] src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp: prefix
    5. 

  5.  isinf with std::
    6. 

  6. 

  7. Prefix isinf with std:: to fix the following build failure with gcc 4.9:
    8. 

  8. 

  9. ../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp: In member function 'bool nv50_ir::GCRA::simplify()':
    10. 

  10. ../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1350:29: error: 'isinf' was not declared in this scope
    11. 

  11.           if (isinf(bestScore)) {
    12. 

  12.                              ^
    13. 

  13. ../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1350:29: note: suggested alternative:
    14. 

  14. In file included from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/random:38:0,
    15. 

  15.                  from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/bits/stl_algo.h:66,
    16. 

  16.                  from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/algorithm:62,
    17. 

  17.                  from ../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:26:
    18. 

  18. /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/cmath:621:5: note:   'std::isinf'
    19. 

  19.      isinf(_Tp __x)
    20. 

  20.      ^
    21. 

  21. 

  22. Fixes:
    23. 

  23.  - http://autobuild.buildroot.org/results/599dc3478ed65d36fbf9f5e9625691dfa813b530
    24. 

  24. 

  25. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    26. 

  26. [Upstream status:
    27. 

  27. https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3227]
    28. 

  28. ---
    29. 

  29.  src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 2 +-
    30. 

  30.  1 file changed, 1 insertion(+), 1 deletion(-)
    31. 

  31. 

  32. diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
    33. 

  33. index 6df2664da22..e81fb117213 100644
    34. 

  34. --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
    35. 

  35. +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
    36. 

  36. @@ -1345,7 +1345,7 @@ GCRA::simplify()
    37. 

  37.                 bestMaxReg = it->maxReg;
    38. 

  38.              }
    39. 

  39.           }
    40. 

  40. -         if (isinf(bestScore)) {
    41. 

  41. +         if (std::isinf(bestScore)) {
    42. 

  42.              ERROR("no viable spill candidates left\n");
    43. 

  43.              return false;
    44. 

  44.           }
    45. 

  45. -- 
    46. 

  46. 2.24.0
    47. 

  47.