Skip to content

Commit e8d20ca

Browse files
jschwejschwe
committed
examples: prefer ptr::cast() over as casts
Fixes pedantic clippy lint `ptr_as_ptr`. Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
1 parent ef3fa93 commit e8d20ca

File tree

3 files changed

+49
-81
lines changed

3 files changed

+49
-81
lines changed

‎examples/common/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Shader {
6868
gl::ShaderSource(
6969
shader,
7070
1,
71-
&(source.as_ptr() as *const GLchar),
71+
&(source.as_ptr().cast()),
7272
&(source.len() as GLint),
7373
);
7474
ck();
@@ -116,7 +116,7 @@ impl Buffer {
116116
gl::BufferData(
117117
gl::ARRAY_BUFFER,
118118
data.len() as isize,
119-
data.as_ptr() as *const c_void,
119+
data.as_ptr().cast(),
120120
gl::STATIC_DRAW,
121121
);
122122
ck();

‎examples/offscreen.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl TriVertexArray {
188188
ck();
189189

190190
let vertex_buffer = Buffer::from_data(slice::from_raw_parts(
191-
TRI_VERTICES.as_ptr() as *const u8,
191+
TRI_VERTICES.as_ptr().cast(),
192192
mem::size_of::<Vertex>() * 3,
193193
));
194194

@@ -251,10 +251,9 @@ impl TriProgram {
251251
let program = Program::new(vertex_shader, fragment_shader);
252252
unsafe {
253253
let position_attribute =
254-
gl::GetAttribLocation(program.object, c"aPosition".as_ptr() as *const GLchar);
254+
gl::GetAttribLocation(program.object, c"aPosition".as_ptr().cast());
255255
ck();
256-
let color_attribute =
257-
gl::GetAttribLocation(program.object, c"aColor".as_ptr() as *const GLchar);
256+
let color_attribute = gl::GetAttribLocation(program.object, c"aColor".as_ptr().cast());
258257
ck();
259258
TriProgram {
260259
program,

‎examples/threads.rs

+44-75
Original file line numberDiff line numberDiff line change
@@ -811,26 +811,21 @@ impl BlitProgram {
811811
let program = Program::new(vertex_shader, fragment_shader);
812812
unsafe {
813813
let position_attribute =
814-
gl::GetAttribLocation(program.object, c"aPosition".as_ptr() as *const GLchar);
814+
gl::GetAttribLocation(program.object, c"aPosition".as_ptr().cast());
815815
ck();
816816
let transform_uniform =
817-
gl::GetUniformLocation(program.object, c"uTransform".as_ptr() as *const GLchar);
817+
gl::GetUniformLocation(program.object, c"uTransform".as_ptr().cast());
818818
ck();
819819
let translation_uniform =
820-
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr() as *const GLchar);
820+
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr().cast());
821821
ck();
822-
let tex_transform_uniform = gl::GetUniformLocation(
823-
program.object,
824-
c"uTexTransform".as_ptr() as *const GLchar,
825-
);
822+
let tex_transform_uniform =
823+
gl::GetUniformLocation(program.object, c"uTexTransform".as_ptr().cast());
826824
ck();
827-
let tex_translation_uniform = gl::GetUniformLocation(
828-
program.object,
829-
c"uTexTranslation".as_ptr() as *const GLchar,
830-
);
825+
let tex_translation_uniform =
826+
gl::GetUniformLocation(program.object, c"uTexTranslation".as_ptr().cast());
831827
ck();
832-
let source_uniform =
833-
gl::GetUniformLocation(program.object, c"uSource".as_ptr() as *const GLchar);
828+
let source_uniform = gl::GetUniformLocation(program.object, c"uSource".as_ptr().cast());
834829
ck();
835830
BlitProgram {
836831
program,
@@ -883,49 +878,36 @@ impl GridProgram {
883878
let program = Program::new(vertex_shader, fragment_shader);
884879
unsafe {
885880
let position_attribute =
886-
gl::GetAttribLocation(program.object, c"aPosition".as_ptr() as *const GLchar);
881+
gl::GetAttribLocation(program.object, c"aPosition".as_ptr().cast());
887882
ck();
888883
let transform_uniform =
889-
gl::GetUniformLocation(program.object, c"uTransform".as_ptr() as *const GLchar);
884+
gl::GetUniformLocation(program.object, c"uTransform".as_ptr().cast());
890885
ck();
891886
let translation_uniform =
892-
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr() as *const GLchar);
887+
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr().cast());
893888
ck();
894-
let tex_transform_uniform = gl::GetUniformLocation(
895-
program.object,
896-
c"uTexTransform".as_ptr() as *const GLchar,
897-
);
889+
let tex_transform_uniform =
890+
gl::GetUniformLocation(program.object, c"uTexTransform".as_ptr().cast());
898891
ck();
899-
let tex_translation_uniform = gl::GetUniformLocation(
900-
program.object,
901-
c"uTexTranslation".as_ptr() as *const GLchar,
902-
);
892+
let tex_translation_uniform =
893+
gl::GetUniformLocation(program.object, c"uTexTranslation".as_ptr().cast());
903894
ck();
904-
let gridline_color_uniform = gl::GetUniformLocation(
905-
program.object,
906-
c"uGridlineColor".as_ptr() as *const GLchar,
907-
);
895+
let gridline_color_uniform =
896+
gl::GetUniformLocation(program.object, c"uGridlineColor".as_ptr().cast());
908897
ck();
909898
let bg_color_uniform =
910-
gl::GetUniformLocation(program.object, c"uBGColor".as_ptr() as *const GLchar);
899+
gl::GetUniformLocation(program.object, c"uBGColor".as_ptr().cast());
911900
ck();
912-
let radius_uniform =
913-
gl::GetUniformLocation(program.object, c"uRadius".as_ptr() as *const GLchar);
901+
let radius_uniform = gl::GetUniformLocation(program.object, c"uRadius".as_ptr().cast());
914902
ck();
915-
let camera_position_uniform = gl::GetUniformLocation(
916-
program.object,
917-
c"uCameraPosition".as_ptr() as *const GLchar,
918-
);
903+
let camera_position_uniform =
904+
gl::GetUniformLocation(program.object, c"uCameraPosition".as_ptr().cast());
919905
ck();
920-
let light_position_uniform = gl::GetUniformLocation(
921-
program.object,
922-
c"uLightPosition".as_ptr() as *const GLchar,
923-
);
906+
let light_position_uniform =
907+
gl::GetUniformLocation(program.object, c"uLightPosition".as_ptr().cast());
924908
ck();
925-
let sphere_position_uniform = gl::GetUniformLocation(
926-
program.object,
927-
c"uSpherePosition".as_ptr() as *const GLchar,
928-
);
909+
let sphere_position_uniform =
910+
gl::GetUniformLocation(program.object, c"uSpherePosition".as_ptr().cast());
929911
ck();
930912
GridProgram {
931913
program,
@@ -985,55 +967,42 @@ impl CheckProgram {
985967
let program = Program::new(vertex_shader, fragment_shader);
986968
unsafe {
987969
let position_attribute =
988-
gl::GetAttribLocation(program.object, c"aPosition".as_ptr() as *const GLchar);
970+
gl::GetAttribLocation(program.object, c"aPosition".as_ptr().cast());
989971
ck();
990972
let transform_uniform =
991-
gl::GetUniformLocation(program.object, c"uTransform".as_ptr() as *const GLchar);
973+
gl::GetUniformLocation(program.object, c"uTransform".as_ptr().cast());
992974
ck();
993975
let translation_uniform =
994-
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr() as *const GLchar);
976+
gl::GetUniformLocation(program.object, c"uTranslation".as_ptr().cast());
995977
ck();
996-
let tex_transform_uniform = gl::GetUniformLocation(
997-
program.object,
998-
c"uTexTransform".as_ptr() as *const GLchar,
999-
);
978+
let tex_transform_uniform =
979+
gl::GetUniformLocation(program.object, c"uTexTransform".as_ptr().cast());
1000980
ck();
1001-
let tex_translation_uniform = gl::GetUniformLocation(
1002-
program.object,
1003-
c"uTexTranslation".as_ptr() as *const GLchar,
1004-
);
981+
let tex_translation_uniform =
982+
gl::GetUniformLocation(program.object, c"uTexTranslation".as_ptr().cast());
1005983
ck();
1006984
let rotation_uniform =
1007-
gl::GetUniformLocation(program.object, c"uRotation".as_ptr() as *const GLchar);
985+
gl::GetUniformLocation(program.object, c"uRotation".as_ptr().cast());
1008986
ck();
1009987
let color_a_uniform =
1010-
gl::GetUniformLocation(program.object, c"uColorA".as_ptr() as *const GLchar);
988+
gl::GetUniformLocation(program.object, c"uColorA".as_ptr().cast());
1011989
ck();
1012990
let color_b_uniform =
1013-
gl::GetUniformLocation(program.object, c"uColorB".as_ptr() as *const GLchar);
991+
gl::GetUniformLocation(program.object, c"uColorB".as_ptr().cast());
1014992
ck();
1015-
let viewport_origin_uniform = gl::GetUniformLocation(
1016-
program.object,
1017-
c"uViewportOrigin".as_ptr() as *const GLchar,
1018-
);
993+
let viewport_origin_uniform =
994+
gl::GetUniformLocation(program.object, c"uViewportOrigin".as_ptr().cast());
1019995
ck();
1020-
let radius_uniform =
1021-
gl::GetUniformLocation(program.object, c"uRadius".as_ptr() as *const GLchar);
996+
let radius_uniform = gl::GetUniformLocation(program.object, c"uRadius".as_ptr().cast());
1022997
ck();
1023-
let camera_position_uniform = gl::GetUniformLocation(
1024-
program.object,
1025-
c"uCameraPosition".as_ptr() as *const GLchar,
1026-
);
998+
let camera_position_uniform =
999+
gl::GetUniformLocation(program.object, c"uCameraPosition".as_ptr().cast());
10271000
ck();
1028-
let light_position_uniform = gl::GetUniformLocation(
1029-
program.object,
1030-
c"uLightPosition".as_ptr() as *const GLchar,
1031-
);
1001+
let light_position_uniform =
1002+
gl::GetUniformLocation(program.object, c"uLightPosition".as_ptr().cast());
10321003
ck();
1033-
let sphere_position_uniform = gl::GetUniformLocation(
1034-
program.object,
1035-
c"uSpherePosition".as_ptr() as *const GLchar,
1036-
);
1004+
let sphere_position_uniform =
1005+
gl::GetUniformLocation(program.object, c"uSpherePosition".as_ptr().cast());
10371006
ck();
10381007
CheckProgram {
10391008
program,

0 commit comments

Comments
 (0)