archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPU: Remove Mesa + Vega hack.

Browse Source 
This is not needed anymore with linux 4.15 + Mesa 17.3.3.
This commit is contained in:
Clément Foucault
2018-02-07 05:26:56 +01:00
parent 17577c53c6
commit 708ef19d88
4 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/draw/engines/eevee/eevee_bloom.c
View File

@@ -145,14 +145,8 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
for (int i = 0; i < effects->bloom_iteration_ct; ++i) {
texsize[0] /= 2; texsize[1] /= 2;
if (GPU_type_matches(GPU_DEVICE_AMD_VEGA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)) {
texsize[0] = MAX2(texsize[0], 17);
texsize[1] = MAX2(texsize[1], 17);
}
else {
texsize[0] = MAX2(texsize[0], 2);
texsize[1] = MAX2(texsize[1], 2);
}
texsize[0] = MAX2(texsize[0], 2);
texsize[1] = MAX2(texsize[1], 2);
effects->downsamp_texel_size[i][0] = 1.0f / (float)texsize[0];
effects->downsamp_texel_size[i][1] = 1.0f / (float)texsize[1];
@@ -168,14 +162,8 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
for (int i = 0; i < effects->bloom_iteration_ct - 1; ++i) {
texsize[0] /= 2; texsize[1] /= 2;
if (GPU_type_matches(GPU_DEVICE_AMD_VEGA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)) {
texsize[0] = MAX2(texsize[0], 17);
texsize[1] = MAX2(texsize[1], 17);
}
else {
texsize[0] = MAX2(texsize[0], 2);
texsize[1] = MAX2(texsize[1], 2);
}
texsize[0] = MAX2(texsize[0], 2);
texsize[1] = MAX2(texsize[1], 2);
DRWFboTexture tex_bloom = {&txl->bloom_upsample[i], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER};
DRW_framebuffer_init(&fbl->bloom_accum_fb[i], &draw_engine_eevee_type,