foolscreen/soupe3d - Change HQLGGDXUAEVR4FSRVJSRK6SD5RWXDDF7KYH7UYVHG2RT5ZRFLO7AC

[guix] opensubdiv: enable OpenCL

Created by AN7yiWQPR3kmUNRwxhFUJmUpkC2gZeDRKkAxn6EH52qB on January 17, 2023

HQLGGDXUAEVR4FSRVJSRK6SD5RWXDDF7KYH7UYVHG2RT5ZRFLO7AC

Dependencies

In channels

main

Change contents

File deletion: opensubdiv-hlsl-no-osdprimitiveidbase.patch

BF:BFD[3.54] → [2.1245:1312]

BF:BFD[2.1312] → [2.1313:1313]

B:BD[2.1313] → [2.1314:1905]

--- opensubdiv-3.5.0-checkout/opensubdiv/osd/hlslPatchCommon.hlsl.org	2023-01-13 10:02:01.555369539 +0100
+++ opensubdiv-3.5.0-checkout/opensubdiv/osd/hlslPatchCommon.hlsl	2023-01-13 10:02:13.371253791 +0100
@@ -62,7 +62,6 @@
 float4x4 OsdModelViewProjectionMatrix();
 float OsdTessLevel();
 int OsdGregoryQuadOffsetBase();
-int OsdPrimitiveIdBase();
 int OsdBaseVertex();
 
 #ifndef OSD_DISPLACEMENT_CALLBACK
@@ -94,7 +93,7 @@
 
 int OsdGetPatchIndex(int primitiveId)
 {
-    return (primitiveId + OsdPrimitiveIdBase());
+    return primitiveId;
 }
 
 int3 OsdGetPatchParam(int patchIndex)

File deletion: opensubdiv-glsl-no-osdprimitiveidbase.patch

BF:BFD[3.54] → [2.1906:1973]

BF:BFD[2.1973] → [2.1974:1974]

B:BD[2.1974] → [2.1975:2567]

--- opensubdiv-3.5.0-checkout/opensubdiv/osd/glslPatchCommon.glsl.org	2023-01-13 10:05:04.973569914 +0100
+++ opensubdiv-3.5.0-checkout/opensubdiv/osd/glslPatchCommon.glsl	2023-01-13 10:05:59.513033628 +0100
@@ -111,7 +111,6 @@
 mat4 OsdModelViewProjectionMatrix();
 float OsdTessLevel();
 int OsdGregoryQuadOffsetBase();
-int OsdPrimitiveIdBase();
 int OsdBaseVertex();
 
 #ifndef OSD_DISPLACEMENT_CALLBACK
@@ -139,7 +138,7 @@
 
 int OsdGetPatchIndex(int primitiveId)
 {
-    return (primitiveId + OsdPrimitiveIdBase());
+    return primitiveId;
 }
 
 ivec3 OsdGetPatchParam(int patchIndex)

Insertion in guix/vfx/packages/rendering.scm at line 4 [2.3885]
[2.3957]
[2.3957]
```
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages llvm)
```

Insertion in guix/vfx/packages/rendering.scm at line 8 [2.3885]

[2.4027]

  #:use-module (gnu packages graphics)
  #:use-module (gnu packages opencl)
  #:use-module (gnu packages tbb)

Insertion in guix/vfx/packages/rendering.scm at line 12 [2.3885]
[2.4028]
[2.4028]
```
  #:use-module (vfx packages opencl)
```
Insertion in guix/vfx/packages/rendering.scm at line 14 [2.3885]
[2.4064]
[2.4064]
```
  #:use-module (vfx packages lucasfilm)
```
Replacement in guix/vfx/packages/rendering.scm at line 16 [2.3885]
B:BD[2.4101] → [2.4101:4104]
```
  
```
[2.4101]
[2.4104]
```
   
```

Insertion in guix/vfx/packages/rendering.scm at line 22 [2.3885]

[2.4256]

(define-public radeonprorender
  (package
    (name "radeonprorender")
    (version "2.3.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/GPUOpen-LibrariesAndSDKs/RadeonProRenderUSD")
                    (commit "11494e6968065d42cc43feccd8f6c16a77d3b1a8")))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "0v4dkgd2axgj58577vczznsi3vxqbrbbaiqpn2m0psbv2limg4xc"))))
    (build-system cmake-build-system)
    ;;(arguments
    ;; `(#:phases (modify-phases %standard-phases
    ;;             (add-before 'configure 'remove-cmake-overrides
    ;;                (lambda _
    ;;                  (delete-file "cmake/FindOpenCL.cmake")
    ;;                  #t)))))
    (inputs (list
	      libomp
	      tbb-2020
	      mesa-opencl
	      opencl-headers
	      clew
	      ;;vulkan-headers
	      ;;vulkan-loader
	      ;;shaderc
	      ;;glslang
	      usd
	      materialx
	      openvdb))
    (home-page "https://www.amd.com/en/technologies/radeon-prorender")
    (synopsis "USD compatible physically-based GPU path tracer")
    (description "Fast GPU or CPU accelerated viewport rendering on all
OpenCL 1.2 hardware for the open source USD and Hydra system.")
    (license licenses:asl2.0)))

Insertion in guix/vfx/packages/pixar.scm at line 18 [2.7932]
[2.8443]
[2.8443]
```
  #:use-module (gnu packages opencl)
```
Insertion in guix/vfx/packages/pixar.scm at line 27 [2.7932]
[2.8654]
[2.8654]
```
  #:use-module (vfx packages opencl)
```
Insertion in guix/vfx/packages/pixar.scm at line 35 [2.7932]
[2.8851]
[2.8851]
```
  
```

Deletion in guix/vfx/packages/pixar.scm at line 39 [2.7932]

B:BD[2.8984] → [2.8984:9786]


;;(define-public clew
;;  (package
;;    (name "clew")
;;    (version "0.10.0")
;;    (source (origin
;;              (method git-fetch)
;;              (uri (git-reference
;;                    (url "https://github.com/martijnberger/clew")
;;                    (commit "50751dd62c05a03b2b9c001b9eb6e29e392ee9db")))
;;              (file-name (git-file-name name version))
;;              (sha256
;;               (base32
;;                "09aimljgkw5cyxbqq9ybbkybgn957hiic5xw1db7b8znib5pbwi2"))))
;;    (build-system cmake-build-system)
;;    (arguments
;;     `(#:tests? #f))
;;    (home-page "https://github.com/martijnberger/clew")
;;    (synopsis "The OpenCL Extension Wrangler Library")
;;    (description "This basically works like glew, but for OpenCL.")
;;    (license licenses:boost1.0)))

Replacement in guix/vfx/packages/pixar.scm at line 54 [2.7932]

B:BD[2.10301] → [2.10301:10537]

                "05zmhm7izywkvpld1ridqx9pf7frxjg4hv2wqxa4zk1c20gzd055"))
	      (patches (search-patches "vfx/patches/opensubdiv-glsl-no-osdprimitiveidbase.patch"
				       "vfx/patches/opensubdiv-hlsl-no-osdprimitiveidbase.patch"))))

[2.10301]

[2.10537]

                "05zmhm7izywkvpld1ridqx9pf7frxjg4hv2wqxa4zk1c20gzd055"))))

Replacement in guix/vfx/packages/pixar.scm at line 57 [2.7932]

B:BD[2.10590] → [2.10590:10861]

     `(#:phases (modify-phases %standard-phases
                  (add-before 'configure 'set-glew-location
                    (lambda* (#:key inputs #:allow-other-keys)
                      (setenv "GLEW_LOCATION" (assoc-ref inputs "glew"))
                      #t))

[2.10590]

[2.10861]

     `(#:configure-flags (list (string-append "-DOPENCL_INCLUDE_DIRS="
					      (assoc-ref %build-inputs "opencl-headers"))
			       (string-append "-DOPENCL_LIBRARIES="
					      (assoc-ref %build-inputs "mesa-opencl"))
			       (string-append "-DCLEW_LOCATION="
					      (assoc-ref %build-inputs "clew")))
       #:phases (modify-phases %standard-phases

Replacement in guix/vfx/packages/pixar.scm at line 71 [2.7932]

B:BD[2.11187] → [2.11187:11222]

     (list xorg-server-for-tests))

[2.11187]

[2.11222]

     (list xorg-server-for-tests
	   python
	   python-docutils	   
	   doxygen))

Insertion in guix/vfx/packages/pixar.scm at line 77 [2.7932]
[2.11254]
[2.11254]
```
	   glfw
```
Replacement in guix/vfx/packages/pixar.scm at line 79 [2.7932]
B:BD[2.11263] → [2.11263:11301]
```
	   ;;mesa-opencl
	   ;;clew
	   ptex
```
[2.11263]
[2.11301]
```
	   opencl-headers
	   mesa-opencl
	   clew
```
Replacement in guix/vfx/packages/pixar.scm at line 86 [2.7932]
B:BD[2.11384] → [2.11384:11418]
```
           zlib
           glfw))
```
[2.11384]
[2.11418]
```
	   ptex
           zlib))
```

File addition: opencl.scm (----------)

[3.730]

(define-module (vfx packages opencl)
  #:use-module (guix)
  #:use-module (guix git-download)
  #:use-module (guix build-system cmake)
  #:use-module ((guix licenses) #:prefix licenses:))
(define-public clew
 (package
   (name "clew")
   (version "0.10.0")
   (source (origin
             (method git-fetch)
             (uri (git-reference
                   (url "https://github.com/martijnberger/clew")
                   (commit "50751dd62c05a03b2b9c001b9eb6e29e392ee9db")))
             (file-name (git-file-name name version))
             (sha256
              (base32
               "09aimljgkw5cyxbqq9ybbkybgn957hiic5xw1db7b8znib5pbwi2"))))
   (build-system cmake-build-system)
   (arguments
    `(#:tests? #f))
   (home-page "https://github.com/martijnberger/clew")
   (synopsis "The OpenCL Extension Wrangler Library")
   (description "This basically works like glew, but for OpenCL.")
   (license licenses:boost1.0)))

Deletion in guix/vfx/packages/nvidia.scm at line 2 [2.15135]
B:BD[2.15173] → [2.15173:15174]

Deletion in guix/vfx/packages/nvidia.scm at line 3 [2.15135]

B:BD[2.15204] → [2.15204:15841]

  ;;#:use-module (gnu packages cmake)
  ;;#:use-module (gnu packages commencement)
  ;;#:use-module (gnu packages pkg-config)
  ;;#:use-module (gnu packages boost)
  ;;#:use-module (gnu packages tbb)
  ;;#:use-module (gnu packages python)
  ;;#:use-module (gnu packages python-xyz)
  ;;#:use-module (gnu packages xorg)
  #:use-module (gnu packages vulkan)
  #:use-module (gnu packages gl)
  ;;#:use-module (gnu packages glib)
  ;;#:use-module (gnu packages qt)
  ;;#:use-module (gnu packages image)
  ;;#:use-module (gnu packages image-processing)
  ;;#:use-module (gnu packages compression)
  ;;#:use-module (gnu packages graphics)

Replacement in guix/vfx/packages/nvidia.scm at line 22 [2.15135]
B:BD[2.16401] → [2.16401:16427]
```
;; !!!! CUDA MISSING !!!!
```
[2.16401]
[2.16427]
```
;;    ;; TODO: nvidia-cuda package
```

[guix] opensubdiv: enable OpenCL

Dependencies

In channels

Change contents

File deletion: opensubdiv-hlsl-no-osdprimitiveidbase.patch

File deletion: opensubdiv-glsl-no-osdprimitiveidbase.patch

Insertion in guix/vfx/packages/rendering.scm at line 4 [2.3885]

Insertion in guix/vfx/packages/rendering.scm at line 8 [2.3885]

Insertion in guix/vfx/packages/rendering.scm at line 12 [2.3885]

Insertion in guix/vfx/packages/rendering.scm at line 14 [2.3885]

Replacement in guix/vfx/packages/rendering.scm at line 16 [2.3885]

Insertion in guix/vfx/packages/rendering.scm at line 22 [2.3885]

Insertion in guix/vfx/packages/pixar.scm at line 18 [2.7932]

Insertion in guix/vfx/packages/pixar.scm at line 27 [2.7932]

Insertion in guix/vfx/packages/pixar.scm at line 35 [2.7932]

Deletion in guix/vfx/packages/pixar.scm at line 39 [2.7932]

Replacement in guix/vfx/packages/pixar.scm at line 54 [2.7932]

Replacement in guix/vfx/packages/pixar.scm at line 57 [2.7932]

Replacement in guix/vfx/packages/pixar.scm at line 71 [2.7932]

Insertion in guix/vfx/packages/pixar.scm at line 77 [2.7932]

Replacement in guix/vfx/packages/pixar.scm at line 79 [2.7932]

Replacement in guix/vfx/packages/pixar.scm at line 86 [2.7932]

File addition: opencl.scm (----------)

Deletion in guix/vfx/packages/nvidia.scm at line 2 [2.15135]

Deletion in guix/vfx/packages/nvidia.scm at line 3 [2.15135]

Replacement in guix/vfx/packages/nvidia.scm at line 22 [2.15135]