diff options
| author | Witold Baryluk <witold.baryluk+freedesktop@gmail.com> | 2021-01-08 10:16:53 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-01-14 10:43:29 -0800 |
| commit | e1465cd5ec5ba707aa05790212e4382196191597 (patch) | |
| tree | 9f4cd23b1189936c36cd740c1352e249b20a7a57 | |
| parent | d14f279cfd4c23da82c4bfe6c24758db1f9e93fb (diff) | |
lavapipe: Defer lavapipe warning to CreateDevice
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4055
Fixes: b38879f8c5f57b7f1802e433e33181bdf5e72aef
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8377>
(cherry picked from commit 9c54928f7762a59da4638a563e6c852ecbb9c76f)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/frontends/lavapipe/lvp_device.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 937dffca909..b30327424ee 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "lavapipe: Defer lavapipe warning to CreateDevice", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "b38879f8c5f57b7f1802e433e33181bdf5e72aef" }, diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 93426cea1f6..0eaf278679c 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -52,8 +52,6 @@ lvp_physical_device_init(struct lvp_physical_device *device, if (!device->pscreen) return vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY); - fprintf(stderr, "WARNING: lavapipe is not a conformant vulkan implementation, testing use only.\n"); - device->max_images = device->pscreen->get_shader_param(device->pscreen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_SHADER_IMAGES); lvp_physical_device_get_supported_extensions(device, &device->supported_extensions); result = lvp_init_wsi(device); @@ -880,6 +878,8 @@ VkResult lvp_CreateDevice( const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { + fprintf(stderr, "WARNING: lavapipe is not a conformant vulkan implementation, testing use only.\n"); + LVP_FROM_HANDLE(lvp_physical_device, physical_device, physicalDevice); struct lvp_device *device; |