From 9ff819553520198468bf67b4920b50dc5b047bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 24 Apr 2018 11:10:30 +0200 Subject: OpenGL: Remove remaining instances of GL_RGBA16F_ARB. There is no need for it now that we use opengl 3.3. Use GL_RGBA16F instead. --- intern/cycles/device/device.cpp | 2 +- intern/cycles/device/device_cuda.cpp | 2 +- intern/opencolorio/ocio_impl_glsl.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index aa2a10a3dd9..906c01c619d 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -248,7 +248,7 @@ void Device::draw_pixels( if(rgba.data_type == TYPE_HALF) { GLhalf *data_pointer = (GLhalf*)rgba.host_pointer; data_pointer += 4 * y * w; - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, data_pointer); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, w, h, 0, GL_RGBA, GL_HALF_FLOAT, data_pointer); } else { uint8_t *data_pointer = (uint8_t*)rgba.host_pointer; diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 54d4c731ed4..66c3f526ae7 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1893,7 +1893,7 @@ public: glGenTextures(1, &pmem.cuTexId); glBindTexture(GL_TEXTURE_2D, pmem.cuTexId); if(mem.data_type == TYPE_HALF) - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, pmem.w, pmem.h, 0, GL_RGBA, GL_HALF_FLOAT, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, pmem.w, pmem.h, 0, GL_RGBA, GL_HALF_FLOAT, NULL); else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, pmem.w, pmem.h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 08f3c15eb95..e20d507b470 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -218,7 +218,7 @@ static bool ensureCurveMappingAllocated(OCIO_GLSLDrawState *state, OCIO_CurveMap /* clean glError buffer */ while (glGetError() != GL_NO_ERROR) {} - glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA16F_ARB, curve_mapping_settings->lut_size, + glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA16F, curve_mapping_settings->lut_size, 0, GL_RGBA, GL_FLOAT, curve_mapping_settings->lut); state->curve_mapping_texture_allocated = true; -- cgit v1.2.3