Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unpack planar half float #1133

Merged
merged 2 commits into from
Aug 28, 2021
Merged

Fix unpack planar half float #1133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082cc20
Fix ECX register access
kdt3rd Aug 26, 2021
9a3cff9
Fix copy/paste error in special case unpack routine
kdt3rd Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/lib/OpenEXRCore/unpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,21 +144,25 @@ static void (*half_to_float_buffer) (float*, const uint16_t*, int) =
static void
choose_half_to_float_impl ()
{
// regs[2] in the extended block is ECX, where f16c indicator lives
# ifdef _WIN32
int regs[4];

__cpuid (regs, 0);
if (regs[0] >= 1) { __cpuidex (regs, 1, 0); }
else regs[2] = 0;
# else
unsigned int regs[4];
__get_cpuid (0, &regs[0], &regs[1], &regs[2], &regs[3]);
if (regs[0] >= 1)
{
__get_cpuid (1, &regs[0], &regs[1], &regs[2], &regs[3]);
}
else
regs[2] = 0;
# endif
/* F16C is indicated by bit 29 */
if (regs[0] & (1 << 29)) half_to_float_buffer = &half_to_float_buffer_f16c;
if (regs[2] & (1 << 29)) half_to_float_buffer = &half_to_float_buffer_f16c;
}
# else
/* when we explicitly compile against f16, force it in */
Expand Down Expand Up @@ -413,7 +417,7 @@ unpack_16bit_3chan_planar (exr_decode_pipeline_t* decode)
{
in0 = (const uint16_t*) srcbuffer;
in1 = in0 + w;
in2 = in1 + 1;
in2 = in1 + w;
srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion
/* specialise to memcpy if we can */
#if EXR_HOST_IS_NOT_LITTLE_ENDIAN
Expand Down Expand Up @@ -467,7 +471,7 @@ unpack_half_to_float_3chan_planar (exr_decode_pipeline_t* decode)
{
in0 = (const uint16_t*) srcbuffer;
in1 = in0 + w;
in2 = in1 + 1;
in2 = in1 + w;
srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion
/* specialise to memcpy if we can */
half_to_float_buffer ((float*) out0, in0, w);
Expand Down