summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHubert Jarosz2016-08-03 11:37:06 +0200
committerHubert Jarosz2016-08-03 11:37:06 +0200
commitf9c320ddd93f4028845dc23fbd385d9a53c3adc0 (patch)
tree0f41e9f338cf6428ad5b0fc0d948e62579760fde
parent3ee1ea5028fed11a77a8fa991de43d7e6c675e5d (diff)
downloadaur-f9c320ddd93f4028845dc23fbd385d9a53c3adc0.tar.gz
upgrade to 0.30
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
-rw-r--r--patch.diff139
3 files changed, 8 insertions, 152 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3763025402b..e197a84722f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon May 30 23:56:27 UTC 2016
+# Wed Aug 3 09:26:22 UTC 2016
pkgbase = renderdoc
pkgdesc = OpenGL and Vulkan debugging tool
- pkgver = 0.29
+ pkgver = 0.30
pkgrel = 1
url = https://github.com/baldurk/renderdoc
arch = i686
@@ -10,12 +10,10 @@ pkgbase = renderdoc
license = MIT
makedepends = clang
depends = qt5-x11extras
- source = https://github.com/baldurk/renderdoc/archive/v0.29.tar.gz
+ source = https://github.com/baldurk/renderdoc/archive/v0.30.tar.gz
source = renderdoc.desktop
- source = patch.diff
- sha384sums = 8e9525e5eded6939499ec06864035e5fc43904fe65d80e0709d37bb65a96154818243b1c6f21d93a6c5f676c78208f78
+ sha384sums = c852283b5124ca53193f898fde5b4089db745231fae4a7ebed824e84f34aa659d3508b8074f99ac7db1e3587c3fbbba3
sha384sums = 965214960726d34efd08d82a879c75e20e49769e5d7c7d996b570f2754f4688a7331267e0a0e2c54dea1eea3c1ad9e38
- sha384sums = 63912ebeb8b07a18659ea6ceb6de70d7e97f943fb07e4e4a0153760cb9d3fc0885fab8b9a96a0daf4e19fccfa2ff7ea1
pkgname = renderdoc
diff --git a/PKGBUILD b/PKGBUILD
index 88f9c2348fb..9faa0fb1ba6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Hubert Jarosz <marqin.pl+aur at gmail dot com> PGP: 0xFFECF63C1AAB83FF
pkgname=renderdoc
-pkgver=0.29
+pkgver=0.30
pkgrel=1
pkgdesc="OpenGL and Vulkan debugging tool"
arch=(i686 x86_64)
@@ -10,15 +10,12 @@ license=("MIT")
makedepends=("clang")
depends=("qt5-x11extras")
source=("https://github.com/baldurk/renderdoc/archive/v$pkgver.tar.gz"
- "$pkgname.desktop"
- "patch.diff")
-sha384sums=("8e9525e5eded6939499ec06864035e5fc43904fe65d80e0709d37bb65a96154818243b1c6f21d93a6c5f676c78208f78"
- "965214960726d34efd08d82a879c75e20e49769e5d7c7d996b570f2754f4688a7331267e0a0e2c54dea1eea3c1ad9e38"
- "63912ebeb8b07a18659ea6ceb6de70d7e97f943fb07e4e4a0153760cb9d3fc0885fab8b9a96a0daf4e19fccfa2ff7ea1")
+ "$pkgname.desktop")
+sha384sums=("c852283b5124ca53193f898fde5b4089db745231fae4a7ebed824e84f34aa659d3508b8074f99ac7db1e3587c3fbbba3"
+ "965214960726d34efd08d82a879c75e20e49769e5d7c7d996b570f2754f4688a7331267e0a0e2c54dea1eea3c1ad9e38")
build() {
cd $pkgname-$pkgver
- patch -p1 < ../patch.diff
make CXX=clang++
}
diff --git a/patch.diff b/patch.diff
deleted file mode 100644
index fc397be5d14..00000000000
--- a/patch.diff
+++ /dev/null
@@ -1,139 +0,0 @@
- 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;
- }
-