aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/format_pack.py
diff options
context:
space:
mode:
authorMathieu Bridon <[email protected]>2018-07-25 11:53:54 +0200
committerDylan Baker <[email protected]>2018-08-07 13:07:44 -0700
commit9b6746b7c0bef64be419c8cf2ecd916980e2718a (patch)
tree1c84ed2623ee06a682459cc5d1dcd3e662d04285 /src/mesa/main/format_pack.py
parent3dc22381fa6ae6e5964908490f65e2903bd1b38d (diff)
python: Use explicit integer divisions
In Python 2, divisions of integers return an integer: >>> 32 / 4 8 In Python 3 though, they return floats: >>> 32 / 4 8.0 However, Python 3 has an explicit integer division operator: >>> 32 // 4 8 That operator exists on Python >= 2.2, so let's use it everywhere to make the scripts compatible with both Python 2 and 3. In addition, using __future__.division tells Python 2 to behave the same way as Python 3, which helps ensure the scripts produce the same output in both versions of Python. Signed-off-by: Mathieu Bridon <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> (v2) Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/mesa/main/format_pack.py')
-rw-r--r--src/mesa/main/format_pack.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index d3c8d24acd6..0b9e0d424d9 100644
--- a/src/mesa/main/format_pack.py
+++ b/src/mesa/main/format_pack.py
@@ -356,7 +356,7 @@ _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n,
case ${f.name}:
for (i = 0; i < n; ++i) {
pack_ubyte_${f.short_name()}(src[i], d);
- d += ${f.block_size() / 8};
+ d += ${f.block_size() // 8};
}
break;
%endfor
@@ -388,7 +388,7 @@ _mesa_pack_uint_rgba_row(mesa_format format, GLuint n,
case ${f.name}:
for (i = 0; i < n; ++i) {
pack_uint_${f.short_name()}(src[i], d);
- d += ${f.block_size() / 8};
+ d += ${f.block_size() // 8};
}
break;
%endfor
@@ -418,7 +418,7 @@ _mesa_pack_float_rgba_row(mesa_format format, GLuint n,
case ${f.name}:
for (i = 0; i < n; ++i) {
pack_float_${f.short_name()}(src[i], d);
- d += ${f.block_size() / 8};
+ d += ${f.block_size() // 8};
}
break;
%endfor
@@ -1000,6 +1000,6 @@ _mesa_pack_colormask(mesa_format format, const GLubyte colorMask[4], void *dst)
}
"""
-template = Template(string);
+template = Template(string, future_imports=['division']);
print(template.render(argv = argv[0:]))