Update android application labels (#97)

This commit is contained in:
saschawillems 2016-03-25 15:40:55 +01:00
parent 08fc2feecc
commit a09c169505
11 changed files with 12 additions and 10 deletions

View file

@ -12,7 +12,7 @@
<application android:label="vulkanBloom" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanBloom" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Bloom" android:label="Bloom"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanComputeparticles" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanComputeparticles" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Compute Particles" android:label="Compute Particles"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanComputeshader" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanComputeshader" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Compute Shader" android:label="Compute Shader"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanDeferred" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanDeferred" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Deferred" android:label="Deferred"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanMesh" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanMesh" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Mesh" android:label="Mesh"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanOffscreen" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanOffscreen" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Offscreen" android:label="Offscreen"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanParticlefire" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanParticlefire" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Particle Fire" android:label="Particle Fire"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanTexture" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanTexture" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Texture" android:label="Texture"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanTriangle" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanTriangle" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Triangle" android:label="Triangle"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -12,7 +12,7 @@
<application android:label="vulkanScene" android:icon="@drawable/icon" android:hasCode="false"> <application android:label="vulkanScene" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="Vulkan Demo Scene" android:label="Demo Scene"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">

View file

@ -207,6 +207,7 @@ public:
VkClearValue clearValues[2]; VkClearValue clearValues[2];
clearValues[0].color = defaultClearColor; clearValues[0].color = defaultClearColor;
clearValues[0].color = { {0.0f, 0.0f, 0.2f, 0.0f} };
clearValues[1].depthStencil = { 1.0f, 0 }; clearValues[1].depthStencil = { 1.0f, 0 };
VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo(); VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo();
@ -560,6 +561,7 @@ public:
blendAttachmentState.alphaBlendOp = VK_BLEND_OP_ADD; blendAttachmentState.alphaBlendOp = VK_BLEND_OP_ADD;
blendAttachmentState.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA; blendAttachmentState.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA;
blendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; blendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
blendAttachmentState.blendEnable = VK_FALSE;
VkPipelineColorBlendStateCreateInfo colorBlendState = VkPipelineColorBlendStateCreateInfo colorBlendState =
vkTools::initializers::pipelineColorBlendStateCreateInfo( vkTools::initializers::pipelineColorBlendStateCreateInfo(