summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD22
-rw-r--r--patch.diff139
-rw-r--r--patch1.diff16
-rw-r--r--patch2.diff80
5 files changed, 159 insertions, 117 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5829746ba56..3763025402b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
# Generated by mksrcinfo v8
-# Tue Feb 23 00:38:59 UTC 2016
+# Mon May 30 23:56:27 UTC 2016
pkgbase = renderdoc
pkgdesc = OpenGL and Vulkan debugging tool
- pkgver = 0.27
- pkgrel = 3
+ pkgver = 0.29
+ pkgrel = 1
url = https://github.com/baldurk/renderdoc
arch = i686
arch = x86_64
license = MIT
+ makedepends = clang
depends = qt5-x11extras
- source = https://github.com/baldurk/renderdoc/archive/v0.27.tar.gz
+ source = https://github.com/baldurk/renderdoc/archive/v0.29.tar.gz
source = renderdoc.desktop
- source = patch1.diff
- source = patch2.diff
- sha256sums = bcb3dba88d07c57ba84830578da9b49c56ff5071e33b3f97bdeb265fb0040a63
- sha256sums = eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984
- sha256sums = f166de9d2bb46b8d64e73e7e8afe026525ecfb58d47fc5dacf0b0fff7a57adf2
- sha256sums = bfcc7d9deb98110848f9376b490cc5b182aa90fd673beb822b56e5d21ae75b38
+ source = patch.diff
+ sha384sums = 8e9525e5eded6939499ec06864035e5fc43904fe65d80e0709d37bb65a96154818243b1c6f21d93a6c5f676c78208f78
+ sha384sums = 965214960726d34efd08d82a879c75e20e49769e5d7c7d996b570f2754f4688a7331267e0a0e2c54dea1eea3c1ad9e38
+ sha384sums = 63912ebeb8b07a18659ea6ceb6de70d7e97f943fb07e4e4a0153760cb9d3fc0885fab8b9a96a0daf4e19fccfa2ff7ea1
pkgname = renderdoc
diff --git a/PKGBUILD b/PKGBUILD
index 4347eaefdb3..88f9c2348fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,25 @@
# Maintainer: Hubert Jarosz <marqin.pl+aur at gmail dot com> PGP: 0xFFECF63C1AAB83FF
pkgname=renderdoc
-pkgver=0.27
-pkgrel=3
+pkgver=0.29
+pkgrel=1
pkgdesc="OpenGL and Vulkan debugging tool"
arch=(i686 x86_64)
url="https://github.com/baldurk/renderdoc"
license=("MIT")
-depends=(qt5-x11extras)
+makedepends=("clang")
+depends=("qt5-x11extras")
source=("https://github.com/baldurk/renderdoc/archive/v$pkgver.tar.gz"
- "$pkgname.desktop" "patch1.diff" "patch2.diff")
-sha256sums=('bcb3dba88d07c57ba84830578da9b49c56ff5071e33b3f97bdeb265fb0040a63'
- 'eab4941dc17fbbdcb9e34a698c3b304d212be54956daeb0c3b1cf5b7f2b00984'
- 'f166de9d2bb46b8d64e73e7e8afe026525ecfb58d47fc5dacf0b0fff7a57adf2'
- 'bfcc7d9deb98110848f9376b490cc5b182aa90fd673beb822b56e5d21ae75b38')
+ "$pkgname.desktop"
+ "patch.diff")
+sha384sums=("8e9525e5eded6939499ec06864035e5fc43904fe65d80e0709d37bb65a96154818243b1c6f21d93a6c5f676c78208f78"
+ "965214960726d34efd08d82a879c75e20e49769e5d7c7d996b570f2754f4688a7331267e0a0e2c54dea1eea3c1ad9e38"
+ "63912ebeb8b07a18659ea6ceb6de70d7e97f943fb07e4e4a0153760cb9d3fc0885fab8b9a96a0daf4e19fccfa2ff7ea1")
build() {
cd $pkgname-$pkgver
- patch -p1 < ../patch1.diff
- patch -p1 < ../patch2.diff
- make
+ patch -p1 < ../patch.diff
+ make CXX=clang++
}
package() {
diff --git a/patch.diff b/patch.diff
new file mode 100644
index 00000000000..fc397be5d14
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,139 @@
+ renderdoc/CMakeLists.txt | 3 +++
+ renderdoc/driver/vulkan/vk_replay.cpp | 33 ++++++++++++++++++++++++++++++---
+ renderdoc/maths/half_convert.h | 9 +++++++--
+ renderdoc/serialise/utf8printf.cpp | 19 +++++++++++++++----
+ 4 files changed, 55 insertions(+), 9 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 0a7eed3..0051a2d 100644
+--- a/renderdoc/CMakeLists.txt
++++ b/renderdoc/CMakeLists.txt
+@@ -138,6 +138,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ PROPERTIES COMPILE_FLAGS "-Wno-extra -Wno-unused-function")
+ endif()
+
++set_source_files_properties(3rdparty/jpeg-compressor/jpgd.cpp
++ PROPERTIES COMPILE_FLAGS "-Wno-shift-negative-value")
++
+ add_library(rdoc OBJECT ${sources})
+ target_compile_definitions(rdoc ${RDOC_DEFINITIONS})
+ target_include_directories(rdoc ${RDOC_INCLUDES})
+diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
+index d0b5738..6e9eb18 100644
+--- a/renderdoc/driver/vulkan/vk_replay.cpp
++++ b/renderdoc/driver/vulkan/vk_replay.cpp
+@@ -1584,7 +1584,8 @@ void VulkanReplay::RenderMesh(uint32_t eventID, const vector<MeshFormat> &second
+ MeshUBOData *data = (MeshUBOData *)GetDebugManager()->m_MeshUBO.Map(vt, dev, &uboOffs);
+
+ data->mvp = ModelViewProj;
+- data->color = (Vec4f &)cfg.prevMeshColour;
++ data->color = Vec4f(cfg.prevMeshColour.x, cfg.prevMeshColour.y, cfg.prevMeshColour.z,
++ cfg.prevMeshColour.w);
+ data->homogenousInput = cfg.position.unproject;
+ data->pointSpriteSize = Vec2f(0.0f, 0.0f);
+ data->displayFormat = MESHDISPLAY_SOLID;
+@@ -3257,7 +3258,20 @@ void VulkanReplay::SavePipelineState()
+ dst.bindings[b].binds[a].res = rm->GetOriginalID(c.m_BufferView[viewid].buffer);
+ dst.bindings[b].binds[a].offset = c.m_BufferView[viewid].offset;
+ if(dynamicOffset)
+- dst.bindings[b].binds[a].offset += *(uint32_t *)&info[a].imageInfo.imageLayout;
++ {
++ union
++ {
++ VkImageLayout l;
++ uint32_t u;
++ } offs;
++
++ RDCCOMPILE_ASSERT(sizeof(VkImageLayout) == sizeof(uint32_t),
++ "VkImageLayout isn't 32-bit sized");
++
++ offs.l = info[a].imageInfo.imageLayout;
++
++ dst.bindings[b].binds[a].offset += offs.u;
++ }
+ dst.bindings[b].binds[a].size = c.m_BufferView[viewid].size;
+ }
+ else
+@@ -3280,7 +3294,20 @@ void VulkanReplay::SavePipelineState()
+
+ dst.bindings[b].binds[a].offset = info[a].bufferInfo.offset;
+ if(dynamicOffset)
+- dst.bindings[b].binds[a].offset += *(uint32_t *)&info[a].imageInfo.imageLayout;
++ {
++ union
++ {
++ VkImageLayout l;
++ uint32_t u;
++ } offs;
++
++ RDCCOMPILE_ASSERT(sizeof(VkImageLayout) == sizeof(uint32_t),
++ "VkImageLayout isn't 32-bit sized");
++
++ offs.l = info[a].imageInfo.imageLayout;
++
++ dst.bindings[b].binds[a].offset += offs.u;
++ }
+
+ dst.bindings[b].binds[a].size = info[a].bufferInfo.range;
+ }
+diff --git a/renderdoc/maths/half_convert.h b/renderdoc/maths/half_convert.h
+index b6f63d5..4577345 100644
+--- a/renderdoc/maths/half_convert.h
++++ b/renderdoc/maths/half_convert.h
+@@ -121,7 +121,12 @@ inline float ConvertFromHalf(uint16_t comp)
+ }
+ else //if(exponent = 0x1f)
+ {
+- int nan = 0x7F800001;
+- return *(float*)&nan;
++ union
++ {
++ int i;
++ float f;
++ } nan;
++ nan.i = 0x7F800001;
++ return nan.f;
+ }
+ }
+diff --git a/renderdoc/serialise/utf8printf.cpp b/renderdoc/serialise/utf8printf.cpp
+index b9b7aa8..8aa949d 100644
+--- a/renderdoc/serialise/utf8printf.cpp
++++ b/renderdoc/serialise/utf8printf.cpp
+@@ -115,22 +115,33 @@ void PrintInteger(bool typeUnsigned, uint64_t argu, int base, uint64_t numbits,
+ {
+ int64_t argi = 0;
+
++ union
++ {
++ uint64_t *u64;
++ signed int *i;
++ signed char *c;
++ signed short *s;
++ int64_t *i64;
++ } typepun;
++
++ typepun.u64 = &argu;
++
+ // cast the appropriate size to signed version
+ switch(formatter.Length)
+ {
+ default:
+ case None:
+ case Long:
+- argi = (int64_t)*(signed int*)&argu;
++ argi = (int64_t)*typepun.i;
+ break;
+ case HalfHalf:
+- argi = (int64_t)*(signed char*)&argu;
++ argi = (int64_t)*typepun.c;
+ break;
+ case Half:
+- argi = (int64_t)*(signed short*)&argu;
++ argi = (int64_t)*typepun.s;
+ break;
+ case LongLong:
+- argi = (int64_t)*(int64_t*)&argu;
++ argi = (int64_t)*typepun.i64;
+ break;
+ }
+
diff --git a/patch1.diff b/patch1.diff
deleted file mode 100644
index f15a641e5e3..00000000000
--- a/patch1.diff
+++ /dev/null
@@ -1,16 +0,0 @@
- renderdoc/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
-index dd0769f..c06a0a1 100644
---- a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
-+++ b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
-@@ -48,7 +48,7 @@ namespace {
- bool is_positive_infinity(double x) {
- #ifdef _MSC_VER
- return _fpclass(x) == _FPCLASS_PINF;
--#elif defined __ANDROID__
-+#elif defined __ANDROID__ || defined __linux__
- return std::isinf(x) && (x >= 0);
- #else
- return isinf(x) && (x >= 0);
diff --git a/patch2.diff b/patch2.diff
deleted file mode 100644
index 09d9be2aa90..00000000000
--- a/patch2.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/calc_hash.sh b/calc_hash.sh
-new file mode 100644
-index 0000000..e230e21
---- /dev/null
-+++ b/calc_hash.sh
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED
-diff --git a/hash_version.sh b/hash_version.sh
-index 5d52bd1..b014be5 100644
---- a/hash_version.sh
-+++ b/hash_version.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
-
--GIT_HASH=`git rev-parse HEAD`;
-+GIT_HASH=`sh ./calc_hash.sh`;
-
- rm -f ver
- sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/data/resource.h > ver && mv ver renderdoc/data/resource.h
-diff --git a/renderdoc/Makefile b/renderdoc/Makefile
-index fc7ffac..3c5da50 100644
---- a/renderdoc/Makefile
-+++ b/renderdoc/Makefile
-@@ -1,6 +1,6 @@
- CC=gcc
- CPP=g++
--COMMIT=`git rev-parse HEAD`
-+COMMIT=`sh ../calc_hash.sh`
- MACROS=-DLINUX \
- -DRENDERDOC_PLATFORM=linux \
- -DRENDERDOC_EXPORTS \
-diff --git a/renderdoc/driver/gl/Makefile b/renderdoc/driver/gl/Makefile
-index 2552d95..abc1209 100644
---- a/renderdoc/driver/gl/Makefile
-+++ b/renderdoc/driver/gl/Makefile
-@@ -1,6 +1,6 @@
- CC=gcc
- CPP=g++
--COMMIT=`git rev-parse HEAD`
-+COMMIT=`sh ../../../calc_hash.sh`
- MACROS=-DLINUX \
- -DRENDERDOC_PLATFORM=linux \
- -DRENDERDOC_EXPORTS \
-diff --git a/renderdoc/driver/shaders/spirv/Makefile b/renderdoc/driver/shaders/spirv/Makefile
-index deed81d..ea61c09 100644
---- a/renderdoc/driver/shaders/spirv/Makefile
-+++ b/renderdoc/driver/shaders/spirv/Makefile
-@@ -1,6 +1,6 @@
- CC=gcc
- CPP=g++
--COMMIT=`git rev-parse HEAD`
-+COMMIT=`sh ../../../../calc_hash.sh`
- MACROS=-DLINUX \
- -DRENDERDOC_PLATFORM=linux \
- -DRENDERDOC_EXPORTS \
-diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
-index 6491cf3..3f2c426 100644
---- a/renderdoc/driver/vulkan/Makefile
-+++ b/renderdoc/driver/vulkan/Makefile
-@@ -1,6 +1,6 @@
- CC=gcc
- CPP=g++
--COMMIT=`git rev-parse HEAD`
-+COMMIT=`sh ../../../calc_hash.sh`
- MACROS=-DLINUX \
- -DRENDERDOC_PLATFORM=linux \
- -DRENDERDOC_EXPORTS \
-diff --git a/renderdoccmd/Makefile b/renderdoccmd/Makefile
-index 94af9ef..88d1100 100644
---- a/renderdoccmd/Makefile
-+++ b/renderdoccmd/Makefile
-@@ -1,6 +1,6 @@
- CC=gcc
- CPP=g++
--COMMIT=`git rev-parse HEAD`
-+COMMIT=`sh ../calc_hash.sh`
- MACROS=-DLINUX \
- -DRENDERDOC_PLATFORM=linux \
- -DGIT_COMMIT_HASH="\"$(COMMIT)\""