Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
obs-studio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yunxiang Li
obs-studio
Commits
77edf6f2
Commit
77edf6f2
authored
10 years ago
by
Jim
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused parameter for texture file loading
parent
16f45e72
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libobs/graphics/graphics.c
+1
-2
1 addition, 2 deletions
libobs/graphics/graphics.c
libobs/graphics/graphics.h
+1
-2
1 addition, 2 deletions
libobs/graphics/graphics.h
with
2 additions
and
4 deletions
libobs/graphics/graphics.c
+
1
−
2
View file @
77edf6f2
...
@@ -685,11 +685,10 @@ shader_t gs_create_pixelshader_from_file(const char *file, char **error_string)
...
@@ -685,11 +685,10 @@ shader_t gs_create_pixelshader_from_file(const char *file, char **error_string)
return
shader
;
return
shader
;
}
}
texture_t
gs_create_texture_from_file
(
const
char
*
file
,
uint32_t
flags
)
texture_t
gs_create_texture_from_file
(
const
char
*
file
)
{
{
/* TODO */
/* TODO */
UNUSED_PARAMETER
(
file
);
UNUSED_PARAMETER
(
file
);
UNUSED_PARAMETER
(
flags
);
return
NULL
;
return
NULL
;
}
}
...
...
This diff is collapsed.
Click to expand it.
libobs/graphics/graphics.h
+
1
−
2
View file @
77edf6f2
...
@@ -479,8 +479,7 @@ EXPORT shader_t gs_create_vertexshader_from_file(const char *file,
...
@@ -479,8 +479,7 @@ EXPORT shader_t gs_create_vertexshader_from_file(const char *file,
EXPORT
shader_t
gs_create_pixelshader_from_file
(
const
char
*
file
,
EXPORT
shader_t
gs_create_pixelshader_from_file
(
const
char
*
file
,
char
**
error_string
);
char
**
error_string
);
EXPORT
texture_t
gs_create_texture_from_file
(
const
char
*
file
,
EXPORT
texture_t
gs_create_texture_from_file
(
const
char
*
file
);
uint32_t
flags
);
#define GS_FLIP_U (1<<0)
#define GS_FLIP_U (1<<0)
#define GS_FLIP_V (1<<1)
#define GS_FLIP_V (1<<1)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment