Android shader loading bugfix
This commit is contained in:
parent
04ef1ff28c
commit
06af4a0cee
1 changed files with 5 additions and 5 deletions
|
|
@ -796,11 +796,11 @@ public:
|
||||||
// Load shader from compressed asset
|
// Load shader from compressed asset
|
||||||
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
|
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
|
||||||
assert(asset);
|
assert(asset);
|
||||||
size_t size = AAsset_getLength(asset);
|
shaderSize = AAsset_getLength(asset);
|
||||||
assert(size > 0);
|
assert(shaderSize > 0);
|
||||||
|
|
||||||
shaderCode = new char[size];
|
shaderCode = new char[shaderSize];
|
||||||
AAsset_read(asset, shaderCode, size);
|
AAsset_read(asset, shaderCode, shaderSize);
|
||||||
AAsset_close(asset);
|
AAsset_close(asset);
|
||||||
#else
|
#else
|
||||||
std::ifstream is(filename, std::ios::binary | std::ios::in | std::ios::ate);
|
std::ifstream is(filename, std::ios::binary | std::ios::in | std::ios::ate);
|
||||||
|
|
@ -1136,7 +1136,7 @@ int main(const int argc, const char *argv[])
|
||||||
state->userData = vulkanExample;
|
state->userData = vulkanExample;
|
||||||
state->onAppCmd = VulkanExample::handleAppCommand;
|
state->onAppCmd = VulkanExample::handleAppCommand;
|
||||||
state->onInputEvent = VulkanExample::handleAppInput;
|
state->onInputEvent = VulkanExample::handleAppInput;
|
||||||
vulkanExample->androidApp = state;
|
androidApp = state;
|
||||||
#elif defined(__linux__) && !defined(_DIRECT2DISPLAY)
|
#elif defined(__linux__) && !defined(_DIRECT2DISPLAY)
|
||||||
vulkanExample->setupWindow();
|
vulkanExample->setupWindow();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue