intern/opencolorio/ocio_impl_glsl.cc

@@ -723,7 +723,8 @@ bool OCIOImpl::gpuDisplayShaderBind(OCIO_ConstConfigRcPtr *config,
     GPU_uniformbuf_bind(textures.uniforms_buffer, UNIFORMBUF_SLOT_LUTS);
   }
 
-  updateGPUDisplayParameters(shader, scale, exponent, dither, use_predivide, use_overlay, use_extended);
+  updateGPUDisplayParameters(
+      shader, scale, exponent, dither, use_predivide, use_overlay, use_extended);
   GPU_uniformbuf_bind(shader.parameters_buffer, UNIFORMBUF_SLOT_DISPLAY);
 
   /* TODO(fclem): remove remains of IMM. */

release/datafiles/colormanagement/config.ocio

@@ -56,8 +56,6 @@ displays:
     - !<View> {name: Filmic Log, colorspace: Filmic Log}
     - !<View> {name: Raw, colorspace: Raw}
     - !<View> {name: False Color, colorspace: False Color}
-  Extended sRGB:
-    - !<View> {name: Standard, colorspace: sRGB}
   XYZ:
     - !<View> {name: Standard, colorspace: XYZ}
     - !<View> {name: DCI, colorspace: dci_xyz}
@@ -65,7 +63,7 @@ displays:
   None:
     - !<View> {name: Standard, colorspace: Raw}
 
-active_displays: [sRGB, Extended sRGB, XYZ, None]
+active_displays: [sRGB, XYZ, None]
 active_views: [Standard, Filmic, Filmic Log, Raw, False Color]
 
 colorspaces:

scripts/startup/bl_ui/space_userpref.py

@@ -759,6 +759,9 @@ class USERPREF_PT_viewport_quality(ViewportPanel, CenterAlignMixIn, Panel):
         col.prop(system, "use_overlay_smooth_wire", text="Overlay")
         col.prop(system, "use_edit_mode_smooth_wire", text="Edit Mode")
 
+        col = layout.column(heading="Viewport Colorspace")
+        col.prop(system, "use_hdr", text="High Dynamic Range")
+
 
 class USERPREF_PT_viewport_textures(ViewportPanel, CenterAlignMixIn, Panel):
     bl_label = "Textures"

source/blender/imbuf/intern/colormanagement.cc

@@ -4050,7 +4050,8 @@ bool IMB_colormanagement_setup_glsl_draw_from_space(
   const float gamma = applied_view_settings->gamma;
   const float scale = (exposure == 0.0f) ? 1.0f : powf(2.0f, exposure);
   const float exponent = (gamma == 1.0f) ? 1.0f : 1.0f / max_ff(FLT_EPSILON, gamma);
-  const bool use_extended = STRPREFIX(display_settings->display_device, "Extended");
+  const bool use_extended = U.gpu_flag & USER_GPU_FLAG_HDR_ENABLED;
+  ;
 
   OCIO_ConstConfigRcPtr *config = OCIO_getCurrentConfig();
 

source/blender/makesdna/DNA_userdef_types.h

@@ -1182,6 +1182,7 @@ typedef enum eUserpref_GPU_Flag {
   USER_GPU_FLAG_NO_EDIT_MODE_SMOOTH_WIRE = (1 << 1),
   USER_GPU_FLAG_OVERLAY_SMOOTH_WIRE = (1 << 2),
   USER_GPU_FLAG_SUBDIVISION_EVALUATION = (1 << 3),
+  USER_GPU_FLAG_HDR_ENABLED = (1 << 4)
 } eUserpref_GPU_Flag;
 
 /** #UserDef.tablet_api */

source/blender/makesrna/intern/rna_userdef.c

@@ -5676,6 +5676,14 @@ static void rna_def_userdef_system(BlenderRNA *brna)
   RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
   RNA_def_property_update(prop, 0, "rna_userdef_update");
 
+  prop = RNA_def_property(srna, "use_hdr", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "gpu_flag", USER_GPU_FLAG_HDR_ENABLED);
+  RNA_def_property_ui_text(prop,
+                           "Viewport High Dynamic Range",
+                           "Enable high dynamic range with extended colorspace in viewport, "
+                           "uncapping display brightness for rendered content.");
+  RNA_def_property_update(prop, 0, "rna_userdef_dpi_update");
+
   prop = RNA_def_property(srna, "solid_lights", PROP_COLLECTION, PROP_NONE);
   RNA_def_property_collection_sdna(prop, NULL, "light_param", "");
   RNA_def_property_struct_type(prop, "UserSolidLight");